mirror of
				https://github.com/searxng/searxng.git
				synced 2025-11-02 18:47:05 -05:00 
			
		
		
		
	[fix] enigine redis - avoid error when the engine is loaded
Should be _redis_client to avoid an error when the engine is loaded. Suggested-by: @dalf https://github.com/searxng/searxng/pull/124#pullrequestreview-673885664 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
		
							parent
							
								
									e4b6558339
								
							
						
					
					
						commit
						39c18274c6
					
				@ -20,11 +20,10 @@ paging = False
 | 
				
			|||||||
result_template = 'key-value.html'
 | 
					result_template = 'key-value.html'
 | 
				
			||||||
exact_match_only = True
 | 
					exact_match_only = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
redis_client = None
 | 
					_redis_client = None
 | 
				
			||||||
def init(_engine_settings):
 | 
					def init(_engine_settings):
 | 
				
			||||||
    # pylint: disable=global-statement
 | 
					    global _redis_client  # pylint: disable=global-statement
 | 
				
			||||||
    global redis_client
 | 
					    _redis_client = redis.StrictRedis(
 | 
				
			||||||
    redis_client = redis.StrictRedis(
 | 
					 | 
				
			||||||
        host = host,
 | 
					        host = host,
 | 
				
			||||||
        port = port,
 | 
					        port = port,
 | 
				
			||||||
        db = db,
 | 
					        db = db,
 | 
				
			||||||
@ -33,11 +32,12 @@ def init(_engine_settings):
 | 
				
			|||||||
    )
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def search(query, _params):
 | 
					def search(query, _params):
 | 
				
			||||||
 | 
					    global _redis_client  # pylint: disable=global-statement
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    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]
 | 
				
			||||||
@ -45,7 +45,7 @@ def search(query, _params):
 | 
				
			|||||||
    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(
 | 
					        for res in _redis_client.hscan_iter(
 | 
				
			||||||
                qset, match='*{}*'.format(rest)
 | 
					                qset, match='*{}*'.format(rest)
 | 
				
			||||||
        ):
 | 
					        ):
 | 
				
			||||||
            ret.append({
 | 
					            ret.append({
 | 
				
			||||||
@ -56,17 +56,19 @@ def search(query, _params):
 | 
				
			|||||||
    return []
 | 
					    return []
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def search_keys(query):
 | 
					def search_keys(query):
 | 
				
			||||||
 | 
					    global _redis_client  # pylint: disable=global-statement
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ret = []
 | 
					    ret = []
 | 
				
			||||||
    for key in redis_client.scan_iter(
 | 
					    for key in _redis_client.scan_iter(
 | 
				
			||||||
            match='*{}*'.format(query)
 | 
					            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
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user