git.iko.soy/searx
on master help sign in
[mod] the environment variable SEARX_DEBUG can override the general.debug value in settings.yml
commit3e7554422b7d177e12838882ed0b84878278825e authordalf <alex@al-f.net> dateSat 22 Oct 2016, 19:07 (10 years ago) parente249698
2 files changed+23−4
compare with master
unifiedsplit
searx/__init__.py+20−1 searx/webapp.py+3−3
searx/__init__.py+20−1
@@ -42,7 +42,26 @@ else:
4242with open(settings_path) as settings_yaml:
4343 settings = load(settings_yaml)
4444
45−if settings.get('general', {}).get('debug'):
45+'''
46+enable debug if
47+the environnement variable SEARX_DEBUG is 1 or true
48+(whatever the value in settings.yml)
49+or general.debug=True in settings.yml
50+
51+disable debug if
52+the environnement variable SEARX_DEBUG is 0 or false
53+(whatever the value in settings.yml)
54+or general.debug=False in settings.yml
55+'''
56+searx_debug_env = environ.get('SEARX_DEBUG', '').lower()
57+if searx_debug_env == 'true' or searx_debug_env == '1':
58+ searx_debug = True
59+elif searx_debug_env == 'false' or searx_debug_env == '0':
60+ searx_debug = False
61+else:
62+ searx_debug = settings.get('general', {}).get('debug')
63+
64+if searx_debug:
4665 logging.basicConfig(level=logging.DEBUG)
4766else:
4867 logging.basicConfig(level=logging.WARNING)
searx/webapp.py+3−3
@@ -51,7 +51,7 @@ from flask import (
5151)
5252from flask_babel import Babel, gettext, format_date, format_decimal
5353from flask.json import jsonify
54−from searx import settings, searx_dir
54+from searx import settings, searx_dir, searx_debug
5555from searx.engines import (
5656 categories, engines, get_engines_stats, engine_shortcuts
5757)
@@ -743,8 +743,8 @@ def page_not_found(e):
743743
744744def run():
745745 app.run(
746− debug=settings['general']['debug'],
747− use_debugger=settings['general']['debug'],
746+ debug=searx_debug,
747+ use_debugger=searx_debug,
748748 port=settings['server']['port'],
749749 host=settings['server']['bind_address'],
750750 threaded=True