|  | @@ -78,7 +78,7 @@ class PoolRecall(object):
 | 
											
												
													
														|  |      def flow_pool_recall(self, size=10):
 |  |      def flow_pool_recall(self, size=10):
 | 
											
												
													
														|  |          """从流量池中获取视频"""
 |  |          """从流量池中获取视频"""
 | 
											
												
													
														|  |          log_.info('====== flow pool recall')
 |  |          log_.info('====== flow pool recall')
 | 
											
												
													
														|  | -        flow_pool_key = config_.FLOW_POOL_KEY_NAME
 |  | 
 | 
											
												
													
														|  | 
 |  | +        flow_pool_key = self.get_pool_redis_key('flow')
 | 
											
												
													
														|  |          flow_pool_recall_result = []
 |  |          flow_pool_recall_result = []
 | 
											
												
													
														|  |          flow_pool_recall_videos = []
 |  |          flow_pool_recall_videos = []
 | 
											
												
													
														|  |          # 每次获取的视频数
 |  |          # 每次获取的视频数
 | 
											
										
											
												
													
														|  | @@ -142,6 +142,7 @@ class PoolRecall(object):
 | 
											
												
													
														|  |          :param flow_pool_mapping: 视频id-流量池标记mapping, type-dict
 |  |          :param flow_pool_mapping: 视频id-流量池标记mapping, type-dict
 | 
											
												
													
														|  |          :return:
 |  |          :return:
 | 
											
												
													
														|  |          """
 |  |          """
 | 
											
												
													
														|  | 
 |  | +        flow_pool_key = self.get_pool_redis_key('flow')
 | 
											
												
													
														|  |          videos = []
 |  |          videos = []
 | 
											
												
													
														|  |          for video_id in video_ids:
 |  |          for video_id in video_ids:
 | 
											
												
													
														|  |              for flow_pool in flow_pool_mapping[video_id]:
 |  |              for flow_pool in flow_pool_mapping[video_id]:
 | 
											
										
											
												
													
														|  | @@ -158,7 +159,7 @@ class PoolRecall(object):
 | 
											
												
													
														|  |                  # viewCount <= 0
 |  |                  # viewCount <= 0
 | 
											
												
													
														|  |                  # 从流量召回池移除
 |  |                  # 从流量召回池移除
 | 
											
												
													
														|  |                  value = '{}-{}'.format(item[0], item[1])
 |  |                  value = '{}-{}'.format(item[0], item[1])
 | 
											
												
													
														|  | -                self.redis_helper.remove_value_from_zset(key_name=config_.FLOW_POOL_KEY_NAME, value=value)
 |  | 
 | 
											
												
													
														|  | 
 |  | +                self.redis_helper.remove_value_from_zset(key_name=flow_pool_key, value=value)
 | 
											
												
													
														|  |          return check_result
 |  |          return check_result
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      def get_pool_redis_key(self, pool_type):
 |  |      def get_pool_redis_key(self, pool_type):
 | 
											
										
											
												
													
														|  | @@ -180,7 +181,7 @@ class PoolRecall(object):
 | 
											
												
													
														|  |              return key_name, redis_date
 |  |              return key_name, redis_date
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          elif pool_type == 'flow':
 |  |          elif pool_type == 'flow':
 | 
											
												
													
														|  | -            return config_.FLOW_POOL_KEY_NAME
 |  | 
 | 
											
												
													
														|  | 
 |  | +            return config_.FLOW_POOL_KEY_NAME_PREFIX + str(self.app_type)
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          else:
 |  |          else:
 | 
											
												
													
														|  |              log_.error('pool type error')
 |  |              log_.error('pool type error')
 |