zaclys
/
searxng
mirror of https://github.com/searxng/searxng.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1903 from kvch/feature-ignore-engine-timeout 

Hide error messages from users
This commit is contained in:
Adam Tauber 2020-05-31 23:27:05 +02:00 committed by GitHub
parent d38952c133 e3282748d0
commit e974bbc17a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/admin/engines.rst
View File

@ -26,6 +26,8 @@ Safe search **SS**
Weigth **W** Weigth **W**
------------- ----------- --------------------------------- ------------- ----------- ---------------------------------
Disabled **D** Disabled **D**
------------- ----------- ---------------------------------
Show errors **DE**
============= =========== ================================= ============= =========== =================================
Configuration defaults (at built time): Configuration defaults (at built time):
@ -51,6 +53,7 @@ Configuration defaults (at built time):
- O - O
- W - W
- D - D
- DE
{% for name, mod in engines.items() %} {% for name, mod in engines.items() %}
@ -67,5 +70,6 @@ Configuration defaults (at built time):
- {{(mod.offline and "y") or ""}} - {{(mod.offline and "y") or ""}}
- {{mod.weight or 1 }} - {{mod.weight or 1 }}
- {{(mod.disabled and "y") or ""}} - {{(mod.disabled and "y") or ""}}
- {{(mod.display_error_messages and "y") or ""}}
{% endfor %} {% endfor %}

3
docs/admin/settings.rst
View File

@ -175,6 +175,9 @@ Engine settings
``weigth`` : default ``1`` ``weigth`` : default ``1``
Weighting of the results of this engine. Weighting of the results of this engine.
``display_error_messages`` : default ``True``
When an engine returns an error, the message is displayed on the user interface.
.. note:: .. note::
A few more options are possible, but they are pretty specific to some A few more options are possible, but they are pretty specific to some

1
docs/dev/engine_overview.rst
View File

@ -57,6 +57,7 @@ engine string name of searx-engine
(filename without ``.py``) (filename without ``.py``)
shortcut string shortcut of search-engine shortcut string shortcut of search-engine
timeout string specific timeout for search-engine timeout string specific timeout for search-engine
display_error_messages boolean display error messages on the web UI
======================= =========== =========================================== ======================= =========== ===========================================

1
searx/engines/__init__.py
View File

@ -55,6 +55,7 @@ engine_default_args = {'paging': False,
'continuous_errors': 0, 'continuous_errors': 0,
'time_range_support': False, 'time_range_support': False,
'offline': False, 'offline': False,
'display_error_messages': True,
'tokens': []} 'tokens': []}

1
searx/results.py
View File

@ -346,6 +346,7 @@ class ResultContainer(object):
return resultnum_sum / len(self._number_of_results) return resultnum_sum / len(self._number_of_results)
def add_unresponsive_engine(self, engine_name, error_type, error_message=None): def add_unresponsive_engine(self, engine_name, error_type, error_message=None):
if engines[engine_name].display_error_messages:
self.unresponsive_engines.add((engine_name, error_type, error_message)) self.unresponsive_engines.add((engine_name, error_type, error_message))
def add_timing(self, engine_name, engine_time, page_load_time): def add_timing(self, engine_name, engine_time, page_load_time):