on master help sign in
Merge pull request #1903 from kvch/feature-ignore-engine-timeout
e974bbcAdam Tauber
docs/admin/engines.rst+4
@@ -26,6 +26,8 @@ Safe search **SS**
26Weigth **W**
26Weigth **W**
27------------- ----------- ---------------------------------
27------------- ----------- ---------------------------------
28Disabled **D**
28Disabled **D**
29+------------- ----------- ---------------------------------
30+Show errors **DE**
29============= =========== =================================
31============= =========== =================================
30
32
31Configuration defaults (at built time):
33Configuration defaults (at built time):
@@ -51,6 +53,7 @@ Configuration defaults (at built time):
51 - O
53 - O
52 - W
54 - W
53 - D
55 - D
56+ - DE
54
57
55 {% for name, mod in engines.items() %}
58 {% for name, mod in engines.items() %}
56
59
@@ -67,5 +70,6 @@ Configuration defaults (at built time):
67 - {{(mod.offline and "y") or ""}}
70 - {{(mod.offline and "y") or ""}}
68 - {{mod.weight or 1 }}
71 - {{mod.weight or 1 }}
69 - {{(mod.disabled and "y") or ""}}
72 - {{(mod.disabled and "y") or ""}}
73+ - {{(mod.display_error_messages and "y") or ""}}
70
74
71 {% endfor %}
75 {% endfor %}
docs/admin/settings.rst+3
@@ -175,6 +175,9 @@ Engine settings
175``weigth`` : default ``1``
175``weigth`` : default ``1``
176 Weighting of the results of this engine.
176 Weighting of the results of this engine.
177
177
178+``display_error_messages`` : default ``True``
179+ When an engine returns an error, the message is displayed on the user interface.
180+
178.. note::
181.. note::
179
182
180 A few more options are possible, but they are pretty specific to some
183 A few more options are possible, but they are pretty specific to some
docs/dev/engine_overview.rst+1
@@ -57,6 +57,7 @@ engine string name of searx-engine
57 (filename without ``.py``)
57 (filename without ``.py``)
58shortcut string shortcut of search-engine
58shortcut string shortcut of search-engine
59timeout string specific timeout for search-engine
59timeout string specific timeout for search-engine
60+display_error_messages boolean display error messages on the web UI
60======================= =========== ===========================================
61======================= =========== ===========================================
61
62
62
63
searx/engines/__init__.py+1
@@ -55,6 +55,7 @@ engine_default_args = {'paging': False,
55 'continuous_errors': 0,
55 'continuous_errors': 0,
56 'time_range_support': False,
56 'time_range_support': False,
57 'offline': False,
57 'offline': False,
58+ 'display_error_messages': True,
58 'tokens': []}
59 'tokens': []}
59
60
60
61
searx/results.py+2−1
@@ -346,7 +346,8 @@ class ResultContainer(object):
346 return resultnum_sum / len(self._number_of_results)
346 return resultnum_sum / len(self._number_of_results)
347
347
348 def add_unresponsive_engine(self, engine_name, error_type, error_message=None):
348 def add_unresponsive_engine(self, engine_name, error_type, error_message=None):
349+ if engines[engine_name].display_error_messages:
349− self.unresponsive_engines.add((engine_name, error_type, error_message))
350+ self.unresponsive_engines.add((engine_name, error_type, error_message))
350
351
351 def add_timing(self, engine_name, engine_time, page_load_time):
352 def add_timing(self, engine_name, engine_time, page_load_time):
352 self.timings.append({
353 self.timings.append({