Browse Source

log optimization

liqian 3 years ago
parent
commit
67423bdfd9
3 changed files with 19 additions and 19 deletions
  1. 5 5
      recommend.py
  2. 3 3
      video_rank.py
  3. 11 11
      video_recall.py

+ 5 - 5
recommend.py

@@ -28,7 +28,7 @@ def video_recommend(mid, uid, size, app_type, algo_type, client_info):
     ab_code = config_.AB_CODE
     # ####### 多进程召回
     start_recall = time.time()
-    log_.info('====== recall')
+    # log_.info('====== recall')
     '''     
     cores = multiprocessing.cpu_count()
     pool = multiprocessing.Pool(processes=cores)
@@ -57,7 +57,7 @@ def video_recommend(mid, uid, size, app_type, algo_type, client_info):
 
     # ####### 排序
     start_rank = time.time()
-    log_.info('====== rank')
+    # log_.info('====== rank')
     data = {
         'rov_pool_recall': recall_result_list[0],
         'flow_pool_recall': recall_result_list[1]
@@ -69,7 +69,7 @@ def video_recommend(mid, uid, size, app_type, algo_type, client_info):
 
     if not rank_result:
         # 兜底策略
-        log_.info('====== bottom strategy')
+        # log_.info('====== bottom strategy')
         start_bottom = time.time()
         rank_result = bottom_strategy(size=size, app_type=app_type, ab_code=ab_code)
         end_bottom = time.time()
@@ -77,13 +77,13 @@ def video_recommend(mid, uid, size, app_type, algo_type, client_info):
             mid, uid, rank_result, (end_bottom - start_bottom) * 1000))
 
     # ####### redis数据刷新
-    log_.info('====== update redis')
+    # log_.info('====== update redis')
     # 预曝光数据同步刷新到Redis, 过期时间为0.5h
     redis_helper = RedisHelper()
     preview_key_name = config_.PREVIEW_KEY_PREFIX + '{}.{}'.format(app_type, mid)
     preview_video_ids = [int(item['videoId']) for item in rank_result]
     if preview_video_ids:
-        log_.error('key_name = {} \n values = {}'.format(preview_key_name, tuple(preview_video_ids)))
+        # log_.error('key_name = {} \n values = {}'.format(preview_key_name, tuple(preview_video_ids)))
         redis_helper.add_data_with_set(key_name=preview_key_name, values=tuple(preview_video_ids), expire_time=30*60)
         log_.info('preview redis update success!')
 

+ 3 - 3
video_rank.py

@@ -27,8 +27,8 @@ def video_rank(data, size):
     flow_recall_rank = sorted(data['flow_pool_recall'], key=lambda k: (k.get('rovScore'), 0), reverse=True)
     # 对各路召回的视频进行去重
     rov_recall_rank, flow_recall_rank = remove_duplicate(rov_recall=rov_recall_rank, flow_recall=flow_recall_rank)
-    log_.info('remove_duplicate finished! rov_recall_rank = {}, flow_recall_rank = {}'.format(
-        rov_recall_rank, flow_recall_rank))
+    # log_.info('remove_duplicate finished! rov_recall_rank = {}, flow_recall_rank = {}'.format(
+    #     rov_recall_rank, flow_recall_rank))
     # 从ROV召回池中获取top k
     if len(rov_recall_rank) > 0:
         rank_result = rov_recall_rank[:config_.K]
@@ -42,7 +42,7 @@ def video_rank(data, size):
     while i < size - config_.K:
         # 随机生成[0, 1)浮点数
         rand = random.random()
-        log_.info('rand: {}'.format(rand))
+        # log_.info('rand: {}'.format(rand))
         if rand < config_.P:
             if flow_recall_rank:
                 rank_result.append(flow_recall_rank[0])

+ 11 - 11
video_recall.py

@@ -32,7 +32,7 @@ class PoolRecall(object):
 
     def rov_pool_recall(self, size=10):
         """从ROV召回池中获取视频"""
-        log_.info('====== rov pool recall')
+        # log_.info('====== rov pool recall')
 
         # 获取生效中的置顶视频
         if self.client_info is None:
@@ -40,11 +40,11 @@ class PoolRecall(object):
             top_video_ids, top_video_result = [], []
         else:
             top_video_ids, top_video_result = self.get_top_videos()
-            log_.info('===top video result = {}'.format(top_video_ids))
+            # log_.info('===top video result = {}'.format(top_video_ids))
 
         # 获取修改过rov的视频
         update_rov_video_ids, update_rov_result = self.get_update_rov_videos()
-        log_.info('update rov result = {}'.format(update_rov_video_ids))
+        # log_.info('update rov result = {}'.format(update_rov_video_ids))
         # 与置顶视频去重
         update_rov_video_ids_dup, update_rov_dup_result = [], []
         for item in update_rov_result:
@@ -74,8 +74,8 @@ class PoolRecall(object):
                                                               start=idx, end=idx + get_size - 1,
                                                               with_scores=True)
             et_get = time.time()
-            log_.info('get data from rov pool redis: freq = {}, data = {}, execute time = {}ms'.format(
-                freq, data, (et_get - st_get) * 1000))
+            # log_.info('get data from rov pool redis: freq = {}, data = {}, execute time = {}ms'.format(
+            #     freq, data, (et_get - st_get) * 1000))
             if not data:
                 log_.info('ROV召回池中的视频已取完')
                 break
@@ -117,7 +117,7 @@ class PoolRecall(object):
 
     def flow_pool_recall(self, size=10):
         """从流量池中获取视频"""
-        log_.info('====== flow pool recall')
+        # log_.info('====== flow pool recall')
         flow_pool_key = self.get_pool_redis_key('flow')
         flow_pool_recall_result = []
         flow_pool_recall_videos = []
@@ -134,8 +134,8 @@ class PoolRecall(object):
                                                               start=idx, end=idx + get_size - 1,
                                                               with_scores=True)
             et_get = time.time()
-            log_.info('get data from flow pool redis: freq = {}, data = {}, execute time = {}ms'.format(
-                freq, data, (et_get - st_get) * 1000))
+            # log_.info('get data from flow pool redis: freq = {}, data = {}, execute time = {}ms'.format(
+            #     freq, data, (et_get - st_get) * 1000))
             if not data:
                 log_.info('流量池中的视频已取完')
                 break
@@ -183,8 +183,8 @@ class PoolRecall(object):
                         # )
                         flow_pool_recall_videos.append(video_id)
                 et_check = time.time()
-                log_.info('check result: result = {}, execute time = {}ms'.format(
-                    check_result, (et_check - st_check) * 1000))
+                # log_.info('check result: result = {}, execute time = {}ms'.format(
+                #     check_result, (et_check - st_check) * 1000))
 
                 # 判断错误标记, True为错误
                 if error_flag:
@@ -229,7 +229,7 @@ class PoolRecall(object):
 
         # 本地无记录视频,检查实时分发数
         view_count_result, error_flag = get_videos_remain_view_count(app_type=self.app_type, videos=videos)
-        log_.info('error_flag = {}, view_count_result = {}'.format(error_flag, view_count_result))
+        # log_.info('error_flag = {}, view_count_result = {}'.format(error_flag, view_count_result))
 
         # 判断返回的错误标记,True为错误
         if error_flag: