Merge branch 'local-check-count' into pre-master

app.py

@@ -59,12 +59,12 @@ def homepage_recommend():
             return json.dumps(result)
         else:
             log_.error('categoryId error, categoryId = {}'.format(category_id))
-            result = {'code': -1, 'message': 'fail'}
+            result = {'code': -1, 'message': 'fail', 'traceback': traceback.format_exc()}
             return json.dumps(result)
 
     except Exception as e:
         log_.error(e)
-        result = {'code': -1, 'message': 'fail'}
+        result = {'code': -1, 'message': 'fail', 'traceback': traceback.format_exc()}
         return json.dumps(result)
 
 
@@ -128,11 +128,12 @@ def app_video_hot_list():
         result = {'code': -1, 'message': 'fail'}
         return json.dumps(result)
 
-def serve_forever(ip='0.0.0.0', port=5000):
+
+def serve_forever(ip='0.0.0.0', port=5001):
     pywsgi.WSGIServer((ip, port), app).serve_forever()
 
 
-def apprun(MULTI_PROCESS=True, ip='0.0.0.0', port=5000):
+def apprun(MULTI_PROCESS=True, ip='0.0.0.0', port=5001):
     if MULTI_PROCESS == False:
         WSGIServer((ip, port), app).serve_forever()
     else:

config.py

@@ -159,7 +159,7 @@ class ProductionConfig(BaseConfig):
 
 
 def set_config():
-    #return DevelopmentConfig()
+    # return DevelopmentConfig()
     # return TestConfig()
     return PreProductionConfig()
     # return ProductionConfig()

log.py

@@ -49,7 +49,8 @@ class Log(object):
         self.__console('debug', message)
 
     def info(self, message):
-        self.__console('info', message)
+        # self.__console('info', message)
+        return
 
     def warning(self, message):
         self.__console('warning', message)

utils.py

@@ -1,3 +1,5 @@
+import traceback
+
 import requests
 import json
 import time
@@ -27,7 +29,7 @@ def request_post(request_url, request_data, timeout=1.0):
         else:
             return None
     except requests.exceptions.Timeout as e:
-        log_.error('url: {} timeout, exception: {}'.format(request_url, e))
+        log_.error('url: {} timeout, exception: {}, traceback: {}'.format(request_url, e, traceback.format_exc()))
         return None
 
 

video_recall.py

@@ -154,20 +154,20 @@ class PoolRecall(object):
                 videos.append({'videoId': video_id, 'flowPool': flow_pool})
         view_count_result = get_videos_remain_view_count(app_type=self.app_type, videos=videos)
         log_.info('view_count_result = {}'.format(view_count_result))
-        if not view_count_result:
-            return None
+
         check_result = []
         for item in view_count_result:
             if item[2] > 0:
-                # viewCount > 0，判断本地分发数
+                # viewCount > 0
+                # 判断本地分发数
                 cur_count = get_videos_local_distribute_count(video_id=item[0], flow_pool=item[1])
                 # 无记录 或 cur_count > 0
                 if cur_count is None or cur_count > 0:
                     check_result.append(item)
                 # cur_count <= 0，从流量召回池移除
-                # else:
-                #     value = '{}-{}'.format(item[0], item[1])
-                #     self.redis_helper.remove_value_from_zset(key_name=flow_pool_key, value=value)
+                else:
+                    value = '{}-{}'.format(item[0], item[1])
+                    self.redis_helper.remove_value_from_zset(key_name=flow_pool_key, value=value)
             else:
                 # viewCount <= 0
                 # 从流量召回池移除