update

config.py

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

video_recall.py

@@ -170,7 +170,7 @@ class PoolRecall(object):
         :param flow_pool_mapping: 视频id-流量池标记mapping, type-dict
         :return: check_result, error_flag
         """
-        flow_pool_key = self.get_pool_redis_key('flow')
+        # flow_pool_key = self.get_pool_redis_key('flow')
         videos = []
         check_result = []
         for video_id in video_ids:
@@ -184,10 +184,12 @@ class PoolRecall(object):
                 # 本地分发数 cur_count > 0
                 elif cur_count > 0:
                     check_result.append((video_id, flow_pool))
-                # 本地分发数 cur_count <= 0，从流量召回池移除
+                # 本地分发数 cur_count <= 0，从所有的流量召回池移除
                 else:
                     value = '{}-{}'.format(video_id, flow_pool)
-                    self.redis_helper.remove_value_from_zset(key_name=flow_pool_key, value=value)
+                    for item in config_.APP_TYPE:
+                        flow_pool_key = config_.FLOW_POOL_KEY_NAME_PREFIX + str(config_.APP_TYPE.get(item))
+                        self.redis_helper.remove_value_from_zset(key_name=flow_pool_key, value=value)
         # 本次视频都有本地记录
         if len(videos) == 0:
             error_flag = False
@@ -234,7 +236,9 @@ class PoolRecall(object):
                 # viewCount <= 0
                 # 从流量召回池移除
                 value = '{}-{}'.format(item[0], item[1])
-                self.redis_helper.remove_value_from_zset(key_name=flow_pool_key, value=value)
+                for item in config_.APP_TYPE:
+                    flow_pool_key = config_.FLOW_POOL_KEY_NAME_PREFIX + str(config_.APP_TYPE.get(item))
+                    self.redis_helper.remove_value_from_zset(key_name=flow_pool_key, value=value)
         return check_result, error_flag
 
     def get_pool_redis_key(self, pool_type):