Skip to content

Commit 1bfe3cc

Browse files
committed
merge: 合并upstream第一批PR改动
完成的更新: ✅ PR sunmh207#123 - 避免重复审查(已存在) ✅ PR sunmh207#146 - GitLab 9.5.2兼容性(已存在) ✅ PR sunmh207#162 - 移除Redis/RQ依赖(本次同步)
2 parents eb987cb + 16b2d0b commit 1bfe3cc

2 files changed

Lines changed: 2 additions & 18 deletions

File tree

biz/utils/queue.py

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
import os
22
from multiprocessing import Process
33

4-
from redis import Redis
5-
from rq import Queue
6-
74
from biz.utils.log import logger
85

9-
queue_driver = os.getenv('QUEUE_DRIVER', 'async')
10-
11-
queues = {}
12-
136

147
def handle_queue(function: callable, data: any, token: str, url: str, url_slug: str):
15-
if queue_driver == 'rq':
16-
if url_slug not in queues:
17-
logger.info(f'REDIS_HOST: {os.getenv("REDIS_HOST", "127.0.0.1")}, REDIS_PORT: {os.getenv("REDIS_PORT", 6379)}')
18-
queues[url_slug] = Queue(url_slug, connection=Redis(host=os.getenv('REDIS_HOST', '127.0.0.1'),
19-
port=int(os.getenv('REDIS_PORT', 6379))))
20-
21-
queues[url_slug].enqueue(function, data, token, url, url_slug)
22-
else:
23-
process = Process(target=function, args=(data, token, url, url_slug))
24-
process.start()
8+
process = Process(target=function, args=(data, token, url, url_slug))
9+
process.start()

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ streamlit==1.42.2
1818
streamlit-cookies-manager==0.2.0
1919
tiktoken==0.9.0
2020
zhipuai==2.1.5.20230904
21-
rq==2.1.0
2221
pytest==7.4.0
2322
pytest-mock==3.11.0

0 commit comments

Comments
 (0)