|
@@ -292,13 +292,32 @@ def get_pool_redis_key(pool_type, app_type=None):
|
|
key_name = '{}{}.{}'.format(config_.RECALL_KEY_NAME_PREFIX_APP_TYPE, app_type, redis_date)
|
|
key_name = '{}{}.{}'.format(config_.RECALL_KEY_NAME_PREFIX_APP_TYPE, app_type, redis_date)
|
|
|
|
|
|
return key_name, redis_date
|
|
return key_name, redis_date
|
|
|
|
+
|
|
|
|
+ # appType: [18, 19]
|
|
|
|
+ elif app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
|
|
|
|
+ key_name_prefix = f'{config_.RECALL_KEY_NAME_PREFIX_APP_TYPE}{app_type}.'
|
|
|
|
+ now_date = datetime.today().strftime('%Y%m%d')
|
|
|
|
+ now_h = datetime.now().hour
|
|
|
|
+ key_name = f"{key_name_prefix}{now_date}.{now_h}"
|
|
|
|
+ if redis_helper.key_exists(key_name):
|
|
|
|
+ return key_name, now_h
|
|
|
|
+ else:
|
|
|
|
+ if now_h == 0:
|
|
|
|
+ redis_h = 23
|
|
|
|
+ redis_date = (datetime.today() - timedelta(days=1)).strftime('%Y%m%d')
|
|
|
|
+ else:
|
|
|
|
+ redis_h = now_h - 1
|
|
|
|
+ redis_date = now_date
|
|
|
|
+ key_name = f"{key_name_prefix}{redis_date}.{redis_h}"
|
|
|
|
+ return key_name, redis_h
|
|
|
|
+
|
|
else:
|
|
else:
|
|
# appType = 13 票圈视频app
|
|
# appType = 13 票圈视频app
|
|
if app_type == config_.APP_TYPE['APP']:
|
|
if app_type == config_.APP_TYPE['APP']:
|
|
key_name_prefix = config_.RECALL_KEY_NAME_PREFIX_APP
|
|
key_name_prefix = config_.RECALL_KEY_NAME_PREFIX_APP
|
|
- # appType: [18, 19]
|
|
|
|
- elif app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
|
|
|
|
- key_name_prefix = f'{config_.RECALL_KEY_NAME_PREFIX_APP_TYPE}{app_type}.'
|
|
|
|
|
|
+ # # appType: [18, 19]
|
|
|
|
+ # elif app_type in [config_.APP_TYPE['LAO_HAO_KAN_VIDEO'], config_.APP_TYPE['ZUI_JING_QI']]:
|
|
|
|
+ # key_name_prefix = f'{config_.RECALL_KEY_NAME_PREFIX_APP_TYPE}{app_type}.'
|
|
# 其他
|
|
# 其他
|
|
else:
|
|
else:
|
|
key_name_prefix = config_.RECALL_KEY_NAME_PREFIX
|
|
key_name_prefix = config_.RECALL_KEY_NAME_PREFIX
|