diff options
Diffstat (limited to 'searx/shared')
| -rw-r--r-- | searx/shared/redisdb.py | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/searx/shared/redisdb.py b/searx/shared/redisdb.py index d0071f72c..6cc4e46d1 100644 --- a/searx/shared/redisdb.py +++ b/searx/shared/redisdb.py @@ -26,20 +26,31 @@ import redis from searx import get_setting +OLD_REDIS_URL_DEFAULT_URL = 'unix:///usr/local/searxng-redis/run/redis.sock?db=0' +"""This was the default Redis URL in settings.yml.""" + +_CLIENT = None logger = logging.getLogger('searx.shared.redisdb') -_client = None def client() -> redis.Redis: - return _client + return _CLIENT def initialize(): - global _client # pylint: disable=global-statement + global _CLIENT # pylint: disable=global-statement + redis_url = get_setting('redis.url') try: - _client = redis.Redis.from_url(get_setting('redis.url')) - logger.info("connected redis: %s", get_setting('redis.url')) - except redis.exceptions.ConnectionError as exc: + if redis_url: + _CLIENT = redis.Redis.from_url(redis_url) + logger.info("connected redis: %s", redis_url) + return True + except redis.exceptions.ConnectionError: _pw = pwd.getpwuid(os.getuid()) - logger.error("[%s (%s)] can't connect redis DB ...", _pw.pw_name, _pw.pw_uid) - logger.error(" %s", exc) + logger.exception("[%s (%s)] can't connect redis DB ...", _pw.pw_name, _pw.pw_uid) + if redis_url == OLD_REDIS_URL_DEFAULT_URL: + logger.info( + "You can safely ignore the above Redis error if you don't use Redis." + "You can remove this error by setting redis.url to false in your settings.yml." + ) + return False |