|
@@ -679,6 +679,7 @@ def video_rank(df, now_date, now_h, rule_key, param, region, data_key, rule_rank
|
|
|
rule_rank_h_flag=rule_rank_h_flag, political_filter=political_filter,
|
|
rule_rank_h_flag=rule_rank_h_flag, political_filter=political_filter,
|
|
|
shield_config=shield_config, dup_remove=dup_remove
|
|
shield_config=shield_config, dup_remove=dup_remove
|
|
|
)
|
|
)
|
|
|
|
|
+ log_.info(f"==============")
|
|
|
|
|
|
|
|
|
|
|
|
|
def dup_data(h_video_ids, initial_key_name, dup_key_name, region, political_filter, shield_config, dup_remove):
|
|
def dup_data(h_video_ids, initial_key_name, dup_key_name, region, political_filter, shield_config, dup_remove):
|
|
@@ -805,6 +806,7 @@ def dup_to_redis_with_timecheck(h_video_ids, now_date, now_h, rule_key, h_rule_k
|
|
|
region_24h_status = redis_helper.get_data_from_redis(key_name=config_.REGION_24H_DATA_STATUS)
|
|
region_24h_status = redis_helper.get_data_from_redis(key_name=config_.REGION_24H_DATA_STATUS)
|
|
|
rule_h_status = redis_helper.get_data_from_redis(key_name=config_.RULE_H_DATA_STATUS)
|
|
rule_h_status = redis_helper.get_data_from_redis(key_name=config_.RULE_H_DATA_STATUS)
|
|
|
if rule_24h_status == '1' and region_24h_status == '1' and rule_h_status == '1':
|
|
if rule_24h_status == '1' and region_24h_status == '1' and rule_h_status == '1':
|
|
|
|
|
+ log_.info("dup data start ....")
|
|
|
# ##### 去重更新不区分地域小时级列表，并另存为redis中
|
|
# ##### 去重更新不区分地域小时级列表，并另存为redis中
|
|
|
if h_rule_key is not None:
|
|
if h_rule_key is not None:
|
|
|
h_key_name = \
|
|
h_key_name = \
|
|
@@ -876,6 +878,7 @@ def dup_to_redis_with_timecheck(h_video_ids, now_date, now_h, rule_key, h_rule_k
|
|
|
shield_config=shield_config, dup_remove=dup_remove)
|
|
shield_config=shield_config, dup_remove=dup_remove)
|
|
|
else:
|
|
else:
|
|
|
# 数据没准备好，1分钟后重新检查
|
|
# 数据没准备好，1分钟后重新检查
|
|
|
|
|
+ log_.info("dup data wait ....")
|
|
|
Timer(
|
|
Timer(
|
|
|
60,
|
|
60,
|
|
|
dup_to_redis_with_timecheck,
|
|
dup_to_redis_with_timecheck,
|
