Merge branch 'redis-data-monitor' into test

video_recall.py

@@ -636,9 +636,9 @@ class PoolRecall(object):
                 #     return None, None
 
                 # 判断当前时间是否晚于rov召回池更新时间 + 1h，发送消息到飞书
-                now_h = datetime.now().hour
-                now_m = datetime.now().minute
-                feishu_text = '{} —— 今日ROV召回池数据未按时更新，请及时查看解决。'.format(config_.ENV_TEXT)
+                # now_h = datetime.now().hour
+                # now_m = datetime.now().minute
+                # feishu_text = '{} —— 今日ROV召回池数据未按时更新，请及时查看解决。'.format(config_.ENV_TEXT)
                 # if now_h == config_.ROV_UPDATE_H + 1 and now_m > config_.ROV_UPDATE_MINUTE:
                 #     send_msg_to_feishu(feishu_text)
                 # elif now_h > config_.ROV_UPDATE_H + 2:
@@ -662,10 +662,10 @@ class PoolRecall(object):
                 redis_date = (date.today() - timedelta(days=1)).strftime('%Y%m%d')
                 key_name = key_name_prefix + redis_date
                 # 判断当前时间是否晚于更新时间，发送消息到飞书
-                now_h = datetime.now().hour
-                feishu_text = '{} —— 今日special mid 数据未按时更新，请及时查看解决。'.format(config_.ENV_TEXT)
-                if now_h > config_.ROV_UPDATE_H:
-                    send_msg_to_feishu(feishu_text)
+                # now_h = datetime.now().hour
+                # feishu_text = '{} —— 今日special mid 数据未按时更新，请及时查看解决。'.format(config_.ENV_TEXT)
+                # if now_h > config_.ROV_UPDATE_H:
+                #     send_msg_to_feishu(feishu_text)
 
             return key_name, redis_date
 
@@ -894,11 +894,11 @@ class PoolRecall(object):
                         redis_date = now_date
                     key_name = f"{key_name_prefix}{redis_date}.{redis_h}"
                     # 判断当前时间是否晚于数据正常更新时间，发送消息到飞书
-                    now_m = datetime.now().minute
-                    feishu_text = '{} —— appType = {}, h = {} 数据未按时更新，请及时查看解决。'.format(
-                        config_.ENV_TEXT, self.app_type, h)
-                    if now_m > config_.ROV_H_UPDATE_MINUTE:
-                        send_msg_to_feishu(feishu_text)
+                    # now_m = datetime.now().minute
+                    # feishu_text = '{} —— appType = {}, h = {} 数据未按时更新，请及时查看解决。'.format(
+                    #     config_.ENV_TEXT, self.app_type, h)
+                    # if now_m > config_.ROV_H_UPDATE_MINUTE:
+                    #     send_msg_to_feishu(feishu_text)
                     return key_name, redis_h
 
             # 完整影视资源
@@ -917,11 +917,11 @@ class PoolRecall(object):
                         redis_date = now_date
                     key_name = f"{key_name_prefix}{redis_date}.{redis_h}"
                     # 判断当前时间是否晚于数据正常更新时间，发送消息到飞书
-                    now_m = datetime.now().minute
-                    feishu_text = '{} —— appType = {}, h = {} 完整影视资源数据未按时更新，请及时查看解决。'.format(
-                        config_.ENV_TEXT, self.app_type, h)
-                    if now_m > config_.ROV_H_UPDATE_MINUTE:
-                        send_msg_to_feishu(feishu_text)
+                    # now_m = datetime.now().minute
+                    # feishu_text = '{} —— appType = {}, h = {} 完整影视资源数据未按时更新，请及时查看解决。'.format(
+                    #     config_.ENV_TEXT, self.app_type, h)
+                    # if now_m > config_.ROV_H_UPDATE_MINUTE:
+                    #     send_msg_to_feishu(feishu_text)
                     return key_name, redis_h
 
             else:
@@ -951,11 +951,11 @@ class PoolRecall(object):
                         redis_date = now_date
                     key_name = f"{key_prefix}{self.rule_key}.{redis_date}.{redis_h}"
                     # 判断当前时间是否晚于数据正常更新时间，发送消息到飞书
-                    now_m = datetime.now().minute
-                    feishu_text = '{} —— appType = {}, h = {}, key = {}, province_code = {} 数据未按时更新，请及时查看解决。'.format(
-                        config_.ENV_TEXT, self.app_type, h, key_name, self.client_info.get('provinceCode', '-1'))
-                    if now_m > config_.ROV_H_UPDATE_MINUTE:
-                        send_msg_to_feishu(feishu_text)
+                    # now_m = datetime.now().minute
+                    # feishu_text = '{} —— appType = {}, h = {}, key = {}, province_code = {} 数据未按时更新，请及时查看解决。'.format(
+                    #     config_.ENV_TEXT, self.app_type, h, key_name, self.client_info.get('provinceCode', '-1'))
+                    # if now_m > config_.ROV_H_UPDATE_MINUTE:
+                    #     send_msg_to_feishu(feishu_text)
                     return key_name, redis_h
 
         elif pool_type == 'flow':
@@ -1039,11 +1039,11 @@ class PoolRecall(object):
                 rule_key_name = f'{config_.RECALL_KEY_NAME_PREFIX_BY_DAY}{self.rule_key}.{redis_dt}'
 
                 # 判断当前时间是否晚于数据正常更新时间，发送消息到飞书
-                now_h = datetime.now().hour
-                feishu_text = f'{config_.ENV_TEXT} —— appType = {self.app_type}, date = {now_dt}, ' \
-                              f'rule_key = {self.rule_key} 数据未按时更新，请及时查看解决。'
-                if now_h > config_.ROV_DAY_UPDATE_MINUTE:
-                    send_msg_to_feishu(feishu_text)
+                # now_h = datetime.now().hour
+                # feishu_text = f'{config_.ENV_TEXT} —— appType = {self.app_type}, date = {now_dt}, ' \
+                #               f'rule_key = {self.rule_key} 数据未按时更新，请及时查看解决。'
+                # if now_h > config_.ROV_DAY_UPDATE_MINUTE:
+                #     send_msg_to_feishu(feishu_text)
                 return rule_key_name, redis_dt
         elif pool_type == 'dup':
             now_h = datetime.now().hour
@@ -1142,11 +1142,11 @@ class PoolRecall(object):
                 f"{config_.LAST_VIDEO_FROM_REGION_DUP_PREFIX}{region_dup}.{self.app_type}.{self.mid}.{redis_h}"
 
             # 判断当前时间是否晚于数据正常更新时间，发送消息到飞书
-            now_m = datetime.now().minute
-            feishu_text = f"{config_.ENV_TEXT} —— appType = {self.app_type}, h = {h}, key = {key_name}, " \
-                          f"province_code = {province_code} 数据未按时更新，请及时查看解决。"
-            if now_m > config_.REGION_H_UPDATE_MINUTE:
-                send_msg_to_feishu(feishu_text)
+            # now_m = datetime.now().minute
+            # feishu_text = f"{config_.ENV_TEXT} —— appType = {self.app_type}, h = {h}, key = {key_name}, " \
+            #               f"province_code = {province_code} 数据未按时更新，请及时查看解决。"
+            # if now_m > config_.REGION_H_UPDATE_MINUTE:
+            #     send_msg_to_feishu(feishu_text)
 
         value = self.redis_helper.get_data_from_redis(last_region_dup_key)
         if value: