b329058 · searx · git.iko.soy

searx/engines/__init__.py+7−6

compare with master

unifiedsplit

@@ -72,8 +72,11 @@ def load_engine(engine_data):

72

73 engine_module = engine_data['engine']

74

75− # can raise an exception

75+ try:

76− engine = load_module(engine_module + '.py', engine_dir)

76+ engine = load_module(engine_module + '.py', engine_dir)

77+ except:

78+ logger.exception('Cannot load engine "{}"'.format(engine_module))

79+ return None

77

80

78 for param_name in engine_data:

81 for param_name in engine_data:

79 if param_name == 'engine':

82 if param_name == 'engine':

@@ -251,11 +254,9 @@ def load_engines(engine_list):

251 global engines

254 global engines

252 engines.clear()

255 engines.clear()

253 for engine_data in engine_list:

256 for engine_data in engine_list:

254− try:

255− engine = load_engine(engine_data)

257+ engine = load_engine(engine_data)

258+ if engine is not None:

256 engines[engine.name] = engine

259 engines[engine.name] = engine

257− except:

258− logger.exception('Cannot load engine "{}"'.format(engine_data['engine']))

259 return engines

260 return engines

260

261

262

searx/webapp.py+5−4

@@ -136,6 +136,11 @@ app.jinja_env.lstrip_blocks = True

136app.jinja_env.add_extension('jinja2.ext.loopcontrols')

137app.secret_key = settings['server']['secret_key']

138

139+if not searx_debug \

140+ or os.environ.get("WERKZEUG_RUN_MAIN") == "true" \

141+ or os.environ.get('UWSGI_ORIGINAL_PROC_NAME') is not None:

142+ initialize_engines(settings['engines'])

143+

139babel = Babel(app)

144babel = Babel(app)

140

145

141rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'fa_IR', 'glk', 'he',

146rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'fa_IR', 'glk', 'he',

@@ -1046,10 +1051,6 @@ def page_not_found(e):

1046

1051

1047

1052

1048def run():

1053def run():

1049− if not searx_debug \

1050− or os.environ.get("WERKZEUG_RUN_MAIN") == "true" \

1051− or os.environ.get('UWSGI_ORIGINAL_PROC_NAME') is not None:

1052− initialize_engines(settings['engines'])

1053 logger.debug('starting webserver on %s:%s', settings['server']['bind_address'], settings['server']['port'])

1054 logger.debug('starting webserver on %s:%s', settings['server']['bind_address'], settings['server']['port'])

1054 app.run(

1055 app.run(

1055 debug=searx_debug,

1056 debug=searx_debug,

tests/unit/test_engines.pydeleted−13

@@ -1,13 +0,0 @@

1−# -*- coding: utf-8 -*-

2−

3−import unittest2 as unittest

4−from unittest2.util import strclass

5−from searx.engines import load_engine

6−from searx import settings

7−

8−

9−class TestEngine(unittest.TestCase):

10−

11− def test_engines(self):

12− for engine_data in settings['engines']:

13− load_engine(engine_data)