liqian il y a 2 ans
Parent
commit
2da6f8b4e8
2 fichiers modifiés avec 77 ajouts et 36 suppressions
  1. 33 33
      utils.py
  2. 44 3
      video_recall.py

+ 33 - 33
utils.py

@@ -181,17 +181,17 @@ class FilterVideos(object):
         st_pre = time.time()
         filtered_pre_result = self.filter_video_previewed(self.video_ids)
         # et_pre = time.time()
-        log_.info({
-            'logTimestamp': int(time.time() * 1000),
-            'request_id': self.request_id,
-            'app_type': self.app_type,
-            'mid': self.mid,
-            'uid': self.uid,
-            'operation': 'preview_filter',
-            'request_videos': self.video_ids,
-            'preview_filter_result': filtered_pre_result,
-            'executeTime': (time.time() - st_pre) * 1000
-        })
+        # log_.info({
+        #     'logTimestamp': int(time.time() * 1000),
+        #     'request_id': self.request_id,
+        #     'app_type': self.app_type,
+        #     'mid': self.mid,
+        #     'uid': self.uid,
+        #     'operation': 'preview_filter',
+        #     'request_videos': self.video_ids,
+        #     'preview_filter_result': filtered_pre_result,
+        #     'executeTime': (time.time() - st_pre) * 1000
+        # })
         if not filtered_pre_result:
             return None
 
@@ -201,17 +201,17 @@ class FilterVideos(object):
                                                             ab_code=ab_code, province_code=province_code,
                                                             key_flag=key_flag)
         # et_status = time.time()
-        log_.info({
-            'logTimestamp': int(time.time() * 1000),
-            'request_id': self.request_id,
-            'app_type': self.app_type,
-            'mid': self.mid,
-            'uid': self.uid,
-            'operation': 'status_filter',
-            'request_videos': filtered_pre_result,
-            'status_filter_result': filtered_status_result,
-            'executeTime': (time.time() - st_status) * 1000
-        })
+        # log_.info({
+        #     'logTimestamp': int(time.time() * 1000),
+        #     'request_id': self.request_id,
+        #     'app_type': self.app_type,
+        #     'mid': self.mid,
+        #     'uid': self.uid,
+        #     'operation': 'status_filter',
+        #     'request_videos': filtered_pre_result,
+        #     'status_filter_result': filtered_status_result,
+        #     'executeTime': (time.time() - st_status) * 1000
+        # })
         if not filtered_status_result:
             return None
 
@@ -241,17 +241,17 @@ class FilterVideos(object):
         st_pre = time.time()
         filtered_pre_result = self.filter_video_previewed(self.video_ids)
         # et_pre = time.time()
-        log_.info({
-            'logTimestamp': int(time.time() * 1000),
-            'request_id': self.request_id,
-            'app_type': self.app_type,
-            'mid': self.mid,
-            'uid': self.uid,
-            'operation': 'preview_filter',
-            'request_videos': self.video_ids,
-            'preview_filter_result': filtered_pre_result,
-            'executeTime': (time.time() - st_pre) * 1000
-        })
+        # log_.info({
+        #     'logTimestamp': int(time.time() * 1000),
+        #     'request_id': self.request_id,
+        #     'app_type': self.app_type,
+        #     'mid': self.mid,
+        #     'uid': self.uid,
+        #     'operation': 'preview_filter',
+        #     'request_videos': self.video_ids,
+        #     'preview_filter_result': filtered_pre_result,
+        #     'executeTime': (time.time() - st_pre) * 1000
+        # })
         if not filtered_pre_result:
             return None
 

+ 44 - 3
video_recall.py

@@ -157,6 +157,7 @@ class PoolRecall(object):
         :param expire_time: 末位视频记录redis过期时间
         :return:
         """
+        start_time = time.time()
         # 获取provinceCode
         province_code = self.client_info.get('provinceCode', '-1')
         if province_code == '':
@@ -230,6 +231,12 @@ class PoolRecall(object):
                             break
                         else:
                             continue
+        log_.info({
+            'logTimestamp': int(time.time() * 1000),
+            'request_id': self.request_id,
+            'operation': 'rov_pool_recall_by_h',
+            'executeTime': (time.time() - start_time) * 1000
+        })
 
         return recall_result[:size]
 
@@ -240,6 +247,7 @@ class PoolRecall(object):
         :param expire_time: 末位视频记录redis过期时间
         :return:
         """
+        start_time = time.time()
         # 获取天级规则更新列表相关redis key, 用户上一次在天级规则更新列表对应的位置
         rule_key_name, last_rule_day_recall_key, idx = self.get_video_last_idx_day()
         # 获取天级规则更新列表数据
@@ -304,6 +312,13 @@ class PoolRecall(object):
                             break
                         else:
                             continue
+
+        log_.info({
+            'logTimestamp': int(time.time() * 1000),
+            'request_id': self.request_id,
+            'operation': 'rov_pool_recall_by_day',
+            'executeTime': (time.time() - start_time) * 1000
+        })
         return recall_result[:size]
 
     def rov_pool_recall(self, size=10, expire_time=24*3600, video_type='', push_from=config_.PUSH_FROM['rov_recall']):
@@ -315,8 +330,7 @@ class PoolRecall(object):
         :param push_from: 视频来源标记
         :return:
         """
-        # log_.info('====== rov pool recall')
-
+        start_time = time.time()
         # 获取生效中的置顶视频
         if self.no_op_flag:
             top_video_ids, top_video_result = [], []
@@ -407,11 +421,18 @@ class PoolRecall(object):
         if update_rov_dup_result:
             rov_pool_recall_result.extend(update_rov_dup_result)
         rov_pool_recall_result.sort(key=lambda x: x.get('rovScore', 0), reverse=True)
+
+        log_.info({
+            'logTimestamp': int(time.time() * 1000),
+            'request_id': self.request_id,
+            'operation': 'rov_pool_recall',
+            'executeTime': (time.time() - start_time) * 1000
+        })
         return rov_pool_recall_result[:size]
 
     def flow_pool_recall(self, size=10):
         """从流量池中获取视频"""
-        # log_.info('====== flow pool recall')
+        start_time = time.time()
         flow_pool_key = self.get_pool_redis_key('flow')
         flow_pool_recall_result = []
         flow_pool_recall_videos = []
@@ -491,6 +512,12 @@ class PoolRecall(object):
 
             idx += get_size
 
+        log_.info({
+            'logTimestamp': int(time.time() * 1000),
+            'request_id': self.request_id,
+            'operation': 'flow_pool_recall',
+            'executeTime': (time.time() - start_time) * 1000
+        })
         return flow_pool_recall_result[:size]
 
     def check_video_counts(self, video_ids, flow_pool_mapping):
@@ -1093,6 +1120,7 @@ class PoolRecall(object):
         :param expire_time: 末位视频记录redis过期时间
         :return:
         """
+        start_time = time.time()
         # 获取provinceCode
         province_code = self.client_info.get('provinceCode', '-1')
         if province_code == '':
@@ -1144,6 +1172,12 @@ class PoolRecall(object):
                     else:
                         continue
 
+        log_.info({
+            'logTimestamp': int(time.time() * 1000),
+            'request_id': self.request_id,
+            'operation': 'rov_pool_recall_with_region',
+            'executeTime': (time.time() - start_time) * 1000
+        })
         return recall_result[:size]
 
     def rov_pool_recall_with_region_by_h(self, province_code, size=4, key_flag=''):
@@ -1287,6 +1321,7 @@ class PoolRecall(object):
         :param expire_time: 末位视频记录redis过期时间
         :return:
         """
+        start_time = time.time()
         t = [gevent.spawn(self.rov_pool_recall_h, size),
              gevent.spawn(self.rov_pool_recall_h, size, '24h')]
         gevent.joinall(t)
@@ -1319,6 +1354,12 @@ class PoolRecall(object):
                     else:
                         continue
 
+        log_.info({
+            'logTimestamp': int(time.time() * 1000),
+            'request_id': self.request_id,
+            'operation': 'rule_recall_by_h',
+            'executeTime': (time.time() - start_time) * 1000
+        })
         return recall_result[:size]
 
     def rov_pool_recall_h(self, size=4, key_flag=''):