mirror of https://github.com/searx/searx
[fix] initialize redis engine at the right time
This commit is contained in:
parent
2af7c60598
commit
b2ed65eb6d
|
@ -19,26 +19,35 @@ paging = False
|
||||||
result_template = 'key-value.html'
|
result_template = 'key-value.html'
|
||||||
exact_match_only = True
|
exact_match_only = True
|
||||||
|
|
||||||
redis_client = redis.StrictRedis(
|
_redis_client = None
|
||||||
|
|
||||||
|
|
||||||
|
def init(_):
|
||||||
|
connect()
|
||||||
|
|
||||||
|
|
||||||
|
def connect():
|
||||||
|
global _redis_client
|
||||||
|
_redis_client = redis.StrictRedis(
|
||||||
host=host,
|
host=host,
|
||||||
port=port,
|
port=port,
|
||||||
db=db,
|
db=db,
|
||||||
password=password or None,
|
password=password or None,
|
||||||
decode_responses=True,
|
decode_responses=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def search(query, params):
|
def search(query, params):
|
||||||
if not exact_match_only:
|
if not exact_match_only:
|
||||||
return search_keys(query)
|
return search_keys(query)
|
||||||
ret = redis_client.hgetall(query)
|
ret = _redis_client.hgetall(query)
|
||||||
if ret:
|
if ret:
|
||||||
ret['template'] = result_template
|
ret['template'] = result_template
|
||||||
return [ret]
|
return [ret]
|
||||||
if ' ' in query:
|
if ' ' in query:
|
||||||
qset, rest = query.split(' ', 1)
|
qset, rest = query.split(' ', 1)
|
||||||
ret = []
|
ret = []
|
||||||
for res in redis_client.hscan_iter(qset, match='*{}*'.format(rest)):
|
for res in _redis_client.hscan_iter(qset, match='*{}*'.format(rest)):
|
||||||
ret.append({res[0]: res[1], 'template': result_template})
|
ret.append({res[0]: res[1], 'template': result_template})
|
||||||
return ret
|
return ret
|
||||||
return []
|
return []
|
||||||
|
@ -46,13 +55,13 @@ def search(query, params):
|
||||||
|
|
||||||
def search_keys(query):
|
def search_keys(query):
|
||||||
ret = []
|
ret = []
|
||||||
for key in redis_client.scan_iter(match='*{}*'.format(query)):
|
for key in _redis_client.scan_iter(match='*{}*'.format(query)):
|
||||||
key_type = redis_client.type(key)
|
key_type = _redis_client.type(key)
|
||||||
res = None
|
res = None
|
||||||
if key_type == 'hash':
|
if key_type == 'hash':
|
||||||
res = redis_client.hgetall(key)
|
res = _redis_client.hgetall(key)
|
||||||
elif key_type == 'list':
|
elif key_type == 'list':
|
||||||
res = dict(enumerate(redis_client.lrange(key, 0, -1)))
|
res = dict(enumerate(_redis_client.lrange(key, 0, -1)))
|
||||||
if res:
|
if res:
|
||||||
res['template'] = result_template
|
res['template'] = result_template
|
||||||
res['redis_key'] = key
|
res['redis_key'] = key
|
||||||
|
|
Loading…
Reference in New Issue