3e75544 · searx · git.iko.soy

git.iko.soy/searx

on master help sign in

[mod] the environment variable SEARX_DEBUG can override the general.debug value in settings.yml

3e75544dalf10 years ago

searx/__init__.py+20−1

compare with master

unifiedsplit

@@ -42,7 +42,26 @@ else:

42with open(settings_path) as settings_yaml:

43 settings = load(settings_yaml)

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:

45−if settings.get('general', {}).get('debug'):

62+ searx_debug = settings.get('general', {}).get('debug')

63+

64+if searx_debug:

46 logging.basicConfig(level=logging.DEBUG)

65 logging.basicConfig(level=logging.DEBUG)

47else:

66else:

48 logging.basicConfig(level=logging.WARNING)

67 logging.basicConfig(level=logging.WARNING)

searx/webapp.py+3−3

@@ -51,7 +51,7 @@ from flask import (

51)

52from flask_babel import Babel, gettext, format_date, format_decimal

53from flask.json import jsonify

54−from searx import settings, searx_dir

54+from searx import settings, searx_dir, searx_debug

55from searx.engines import (

56 categories, engines, get_engines_stats, engine_shortcuts

57)

@@ -743,8 +743,8 @@ def page_not_found(e):

743

744def run():

745 app.run(

746− debug=settings['general']['debug'],

746+ debug=searx_debug,

747− use_debugger=settings['general']['debug'],

747+ use_debugger=searx_debug,

748 port=settings['server']['port'],

749 host=settings['server']['bind_address'],

750 threaded=True