From fe419e355bf1527c51e3aee98495d08b89510320 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 15 Jul 2022 18:38:32 +0200 Subject: The checker requires Redis Remove the abstraction in searx.shared.SharedDict. Implement a basic and dedicated scheduler for the checker using a Redis script. --- searx/shared/redisdb.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'searx/shared/redisdb.py') diff --git a/searx/shared/redisdb.py b/searx/shared/redisdb.py index bb7a0eeb4..d0071f72c 100644 --- a/searx/shared/redisdb.py +++ b/searx/shared/redisdb.py @@ -26,26 +26,20 @@ import redis from searx import get_setting -logger = logging.getLogger('searx.shared.redis') +logger = logging.getLogger('searx.shared.redisdb') _client = None -def client(): - global _client # pylint: disable=global-statement - if _client is None: - # not thread safe: in the worst case scenario, two or more clients are - # initialized only one is kept, the others are garbage collected. - _client = redis.Redis.from_url(get_setting('redis.url')) +def client() -> redis.Redis: return _client -def init(): +def initialize(): + global _client # pylint: disable=global-statement try: - c = client() - logger.info("connected redis DB --> %s", c.acl_whoami()) - return True + _client = redis.Redis.from_url(get_setting('redis.url')) + logger.info("connected redis: %s", get_setting('redis.url')) except redis.exceptions.ConnectionError as exc: _pw = pwd.getpwuid(os.getuid()) logger.error("[%s (%s)] can't connect redis DB ...", _pw.pw_name, _pw.pw_uid) logger.error(" %s", exc) - return False -- cgit v1.2.3 From e92755d358df5b34b0181f48f8ba02c7f2939e8f Mon Sep 17 00:00:00 2001 From: Alexandre FLAMENT Date: Fri, 14 Oct 2022 13:27:07 +0000 Subject: Initialize Redis in searx/webapp.py settings.yml: * The default URL was unix:///usr/local/searxng-redis/run/redis.sock?db=0 * The default URL is now "false" The default URL makes the log difficult to deal with: if the admin didn't install a Redis instance, the logs record a false error. It worked before because SearXNG initialized the Redis connection when the limiter started. In this commit, SearXNG initializes Redis in searx/webapp.py so various components can use Redis without taking care of the initialization step. --- searx/shared/redisdb.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'searx/shared/redisdb.py') 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 -- cgit v1.2.3