devol
/
searx
mirror of https://github.com/searx/searx
1
0
Fork 0
Code Issues Releases Wiki Activity

[mod] separate engine load and initialization

This commit is contained in:
Adam Tauber 2017-07-21 14:27:25 +02:00
parent f2b13a7de0
commit 0f6612bb40
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
searx/engines/__init__.py
View File

@ -85,15 +85,6 @@ def load_engine(engine_data):
for engine_attr in dir(engine): for engine_attr in dir(engine):
if engine_attr.startswith('_'): if engine_attr.startswith('_'):
continue continue
if engine_attr == 'init':
init_fn = getattr(engine, engine_attr)
def engine_init():
init_fn()
logger.debug('%s engine initialized', engine_data['name'])
logger.debug('Starting background initialization of %s engine', engine_data['name'])
threading.Thread(target=engine_init).start()
continue
if engine_attr == 'inactive' and getattr(engine, engine_attr) is True: if engine_attr == 'inactive' and getattr(engine, engine_attr) is True:
return None return None
if getattr(engine, engine_attr) is None: if getattr(engine, engine_attr) is None:
@ -226,8 +217,24 @@ def get_engines_stats():
] ]
def initialize_engines(engine_list): def load_engines(engine_list):
global engines
engines.clear()
for engine_data in engine_list: for engine_data in engine_list:
engine = load_engine(engine_data) engine = load_engine(engine_data)
if engine is not None: if engine is not None:
engines[engine.name] = engine engines[engine.name] = engine
return engines
def initialize_engines(engine_list):
load_engines(engine_list)
for engine in engines.items():
if hasattr(engine, 'init'):
init_fn = getattr(engine, engine_attr)
def engine_init():
init_fn()
logger.debug('%s engine initialized', engine_data['name'])
logger.debug('Starting background initialization of %s engine', engine_data['name'])
threading.Thread(target=engine_init).start()