zhangbo 1 year ago
parent
commit
afa81eee73
4 changed files with 15 additions and 18 deletions
  1. 7 1
      config.py
  2. 0 3
      region_rule_rank_h_by24h.py
  3. 8 12
      region_rule_rank_h_task_zhangbo.sh
  4. 0 2
      utils.py

+ 7 - 1
config.py

@@ -2550,7 +2550,13 @@ class TestConfig(BaseConfig):
 
     # 测试环境 过滤用mysql地址
     FILTER_MYSQL_INFO = {
-        'host': 'am-bp1g3ys9u00u483uc131930.ads.aliyuncs.com',
+        # 'host': 'am-bp1g3ys9u00u483uc131930.ads.aliyuncs.com',
+        # 'port': 3306,
+        # 'user': 'lv_manager',
+        # 'password': 'lv_manager@2020',
+        # 'db': 'longvideo',
+        # 'charset': 'utf8'
+        'host': 'am-bp15tqt957i3b3sgi131950.ads.aliyuncs.com',
         'port': 3306,
         'user': 'lv_manager',
         'password': 'lv_manager@2020',

+ 0 - 3
region_rule_rank_h_by24h.py

@@ -153,7 +153,6 @@ def video_rank(df, now_date, now_h, rule_key, param, region, data_key):
     :param region: 所属地域
     :return:
     """
-    log_.info(f'df count = {len(df)}')
     redis_helper = RedisHelper()
     # 获取符合进入召回源条件的视频
     return_count = param.get('return_count', 1)
@@ -185,11 +184,9 @@ def video_rank(df, now_date, now_h, rule_key, param, region, data_key):
         # print(score)
         day_recall_result[int(video_id)] = float(score)
         h_video_ids.append(int(video_id))
-    log_.info(f'day_recall_result count = {len(day_recall_result)}')
     day_recall_key_name = \
         f"{config_.RECALL_KEY_NAME_PREFIX_REGION_BY_24H}{region}:{data_key}:{rule_key}:" \
         f"{datetime.datetime.strftime(now_date, '%Y%m%d')}:{now_h}"
-    log_.info("day_recall_key_name:{}".format(day_recall_key_name))
     log_.info("day_recall_result.type:{}".format(str(type(day_recall_result))))
     log_.info("begin to write redis for day_recall_key_name:{} with {}".format(day_recall_key_name,
                                                                                str(len(day_recall_result))))

+ 8 - 12
region_rule_rank_h_task_zhangbo.sh

@@ -1,17 +1,13 @@
 source /etc/profile
 echo $ROV_OFFLINE_ENV
 if [[ $ROV_OFFLINE_ENV == 'test' ]]; then
-    cd /data2/rov-offline && /root/anaconda3/bin/python /data2/rov-offline/rule_rank_h_by_24h.py &&
-     /root/anaconda3/bin/python /data2/rov-offline/region_rule_rank_h_by24h.py &&
-     /root/anaconda3/bin/python /data2/rov-offline/rule_rank_h_new.py &&
-      /root/anaconda3/bin/python /data2/rov-offline/region_rule_rank_h.py '24h'
-#      /root/anaconda3/bin/python /data2/rov-offline/region_rule_rank_h_new.py
-#      /root/anaconda3/bin/python /data2/rov-offline/laohaokan_recommend_update.py
+    cd /data2/rov-offline && /root/anaconda3/bin/python rule_rank_h_by_24h.py &&
+     /root/anaconda3/bin/python region_rule_rank_h_by24h.py &&
+     /root/anaconda3/bin/python rule_rank_h_new.py &&
+      /root/anaconda3/bin/python region_rule_rank_h.py '24h'
 elif [[ $ROV_OFFLINE_ENV == 'pro' ]]; then
-    cd /data/rov-offline && /root/anaconda3/bin/python /data/rov-offline/rule_rank_h_by_24h.py &&
-     /root/anaconda3/bin/python /data/rov-offline/region_rule_rank_h_by24h.py &&
-     /root/anaconda3/bin/python /data/rov-offline/rule_rank_h_new.py &&
-      /root/anaconda3/bin/python /data/rov-offline/region_rule_rank_h.py '24h'
-#      /root/anaconda3/bin/python /data/rov-offline/region_rule_rank_h_new.py
-#      /root/anaconda3/bin/python /data/rov-offline/laohaokan_recommend_update.py
+    cd /data/rov-offline && /root/anaconda3/bin/python rule_rank_h_by_24h.py &&
+     /root/anaconda3/bin/python region_rule_rank_h_by24h.py &&
+     /root/anaconda3/bin/python rule_rank_h_new.py &&
+      /root/anaconda3/bin/python region_rule_rank_h.py '24h'
 fi

+ 0 - 2
utils.py

@@ -399,9 +399,7 @@ def filter_video_status_app(video_ids):
                       "AND encryption_status != 5 " \
                       "AND transcoding_status = 3 " \
                       "AND video_id IN ({});".format(video_status_sql, video_ids[0])
-                log_.info("sql:{}".format(sql))
                 data = mysql_helper.get_data(sql=sql)
-                log_.info("data:{}".format(data))
 
             else:
                 data = []