mirror of
https://github.com/searxng/searxng.git
synced 2025-07-16 09:49:21 +02:00
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.
This commit is contained in:
parent
fe419e355b
commit
e92755d358
7 changed files with 36 additions and 24 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue