|
|
@@ -1,6 +1,7 @@
|
|
|
import json
|
|
|
from itertools import chain
|
|
|
|
|
|
+from common.execptions import TaskError
|
|
|
from common.log import logger
|
|
|
from crawler.Task import Task
|
|
|
from settings import REDIS
|
|
|
@@ -48,7 +49,7 @@ class RedisQueue:
|
|
|
self.redis.lpush(new_key, *tasks)
|
|
|
return self.get_len(key)
|
|
|
|
|
|
- def pop_task(self, keys, priority=False):
|
|
|
+ def pop_task(self, keys: list, priority=False):
|
|
|
"""
|
|
|
双端队列 右边弹出任务
|
|
|
|
|
|
@@ -60,7 +61,7 @@ class RedisQueue:
|
|
|
results = []
|
|
|
# 避免在while循环中修改参数，将keys参数赋值到临时变量
|
|
|
if not isinstance(keys, list):
|
|
|
- raise TypeError
|
|
|
+ raise TaskError(f'keys类型:list,当前类型:{type(keys).__name__}')
|
|
|
temp_keys = keys
|
|
|
all_keys = list(chain(*[self.get_keys(k) for k in temp_keys]))
|
|
|
|
