zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Revert "[hotfix] interim fix to get docker-build of CI without issues" 

This reverts interim fix from commit 50c4b58db and adds requirement
`redis==4.1.1`.

The interim fix was needed by Alpine images (Docker) [1] and has been fixed in
commit [2] merged with the patch series from [3].  In redis-py version 4.1.1
this pach has been released on PyPi [4].

[1] https://github.com/redis/redis-py/issues/1869
[2] https://github.com/redis/redis-py/commit/1fc1233f
[3] https://github.com/redis/redis-py/pull/1854
[4] https://github.com/redis/redis-py/issues/1880

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Markus Heiser 2022-01-17 17:19:41 +01:00
parent 96ab5e57ff
commit e85744c254
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -13,3 +13,4 @@ uvloop==0.16.0
httpx-socks[asyncio]==0.7.2 httpx-socks[asyncio]==0.7.2
langdetect==1.0.9 langdetect==1.0.9
setproctitle==1.2.2 setproctitle==1.2.2
redis==4.1.1

5
searx/shared/redisdb.py
View File

@ -20,6 +20,7 @@ A redis DB connect can be tested by::
""" """
import logging import logging
import redis
from searx import get_setting from searx import get_setting
logger = logging.getLogger('searx.shared.redis') logger = logging.getLogger('searx.shared.redis')
@ -28,8 +29,6 @@ _client = None
def client(): def client():
global _client # pylint: disable=global-statement global _client # pylint: disable=global-statement
import redis # pylint: disable=import-error, import-outside-toplevel
if _client is None: if _client is None:
# not thread safe: in the worst case scenario, two or more clients are # not thread safe: in the worst case scenario, two or more clients are
# initialized only one is kept, the others are garbage collected. # initialized only one is kept, the others are garbage collected.
@ -38,8 +37,6 @@ def client():
def init(): def init():
import redis # pylint: disable=import-error, import-outside-toplevel
try: try:
c = client() c = client()
logger.info("connected redis DB --> %s", c.acl_whoami()) logger.info("connected redis DB --> %s", c.acl_whoami())