Permalink
Browse files

Merge branch 'master' into patch-2

  • Loading branch information...
kvch committed Aug 19, 2018
2 parents c2da901 + c5c8128 commit 8f744ddfb27188ca0a615916bfb8df0c3b56819f
View
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine:3.8
LABEL maintainer="searx <https://github.com/asciimoo/searx>"
LABEL description="A privacy-respecting, hackable metasearch engine."
View

This file was deleted.

Oops, something went wrong.
View
@@ -264,6 +264,9 @@ def __init__(self, themes, categories, engines, plugins):
'False': False,
'True': True}),
'doi_resolver': MultipleChoiceSetting(['oadoi.org'], choices=DOI_RESOLVERS),
'oscar-style': EnumStringSetting(
settings['ui'].get('theme_args', {}).get('oscar_style', 'logicodev'),
choices=['', 'logicodev', 'logicodev-dark', 'pointhi']),
}
self.engines = EnginesSetting('engines', choices=engines)
View
@@ -147,7 +147,8 @@ def search_one_request_safe(engine_name, query, request_params, result_container
if requests_exception:
# update continuous_errors / suspend_end_time
engine.continuous_errors += 1
engine.suspend_end_time = time() + min(60, engine.continuous_errors)
engine.suspend_end_time = time() + min(settings['search']['max_ban_time_on_fail'],
engine.continuous_errors * settings['search']['ban_time_on_fail'])
else:
# no HTTP error (perhaps an engine error)
# anyway, reset the suspend variables
View
@@ -6,6 +6,8 @@ search:
safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "wikipedia" - leave blank to turn it off by default
language : "en-US"
ban_time_on_fail : 5 # ban time in seconds after engine errors
max_ban_time_on_fail : 120 # max ban time in seconds after engine errors
server:
port : 8888
@@ -20,6 +22,8 @@ ui:
templates_path : "" # Custom templates path - leave it blank if you didn't change
default_theme : oscar # ui theme
default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section
theme_args :
oscar_style : logicodev # default style of oscar
# searx supports result proxification using an external service: https://github.com/asciimoo/morty
# uncomment below section if you have running morty proxy
@@ -204,10 +208,6 @@ engines:
shortcut : fa
disabled : True
- name : 500px
engine : www500px
shortcut : px
- name : 1x
engine : www1x
shortcut : 1x
@@ -60,3 +60,4 @@ <h3>How to debug engines?</h3>
<p><a href="{{ url_for('stats') }}">Stats page</a> contains some useful data about the engines used.</p>
</div>
{% include "__common__/aboutextend.html" ignore missing %}

This file was deleted.

Oops, something went wrong.

0 comments on commit 8f744dd

Please sign in to comment.