diff --git a/DB.py b/DB.py index 1edf1de..3d93a17 100644 --- a/DB.py +++ b/DB.py @@ -76,9 +76,9 @@ class DBVidcon: } def __init__(self): - self.list_key = "video_kw_queue" + self.l1_list_key = "video_l1_queue" self.error_list_key = "error_save_queue" - self.urgent_list_key = "video_urgent_queue" + self.l0_list_key = "video_l0_queue" self.conn = pymysql.connect(**self._MYSQL_CONF) self.cursor = self.conn.cursor() self.redis = redis.Redis(**self._REDIS_CONF) @@ -176,23 +176,23 @@ class DBVidcon: def rollback_records(self, raws): if isinstance(raws, str): raws = [raws] - self.redis.lpush(self.urgent_list_key, *raws) + self.redis.lpush(self.l0_list_key, *raws) @redis_retry(max_retries=3) def rollback_urgent(self, raws): if isinstance(raws, str): raws = [raws] try: - self.redis.lpush(self.urgent_list_key, *raws) + self.redis.lpush(self.l0_list_key, *raws) except redis.exceptions.ConnectionError as e: print("[Redis urgent rollback error]", e) self.reconnect_redis() - self.redis.lpush(self.urgent_list_key, *raws) + self.redis.lpush(self.l0_list_key, *raws) @redis_retry(max_retries=3) def item_keyword(self, count: int = 20): try: - urgent_items = self.fetch_from_redis(count, list_key=self.urgent_list_key) + urgent_items = self.fetch_from_redis(count, list_key=self.l0_list_key) except Exception as e: print("[Redis urgent pop error]", e) self.reconnect_redis() @@ -200,7 +200,7 @@ class DBVidcon: if urgent_items: return urgent_items, 1 try: - items = self.fetch_from_redis(count, list_key=self.list_key) + items = self.fetch_from_redis(count, list_key=self.l1_list_key) except Exception as e: print("[Redis normal pop error]", e) self.reconnect_redis() @@ -213,7 +213,7 @@ class DBVidcon: return if isinstance(payloads, str): payloads = [payloads] - self.redis.rpush(self.list_key, *payloads) + self.redis.rpush(self.l1_list_key, *payloads) print(f"[回滚] 已退回 {len(payloads)} 条") @mysql_retry() @@ -318,8 +318,8 @@ class DBVidcon: """ # 注意:redis.llen 返回 int return ( - self.redis.llen(self.urgent_list_key) == 0 - and self.redis.llen(self.list_key) == 0 + self.redis.llen(self.l0_list_key) == 0 + and self.redis.llen(self.l1_list_key) == 0 ) @redis_retry(max_retries=3)