From 4b07df62e5906e98315e9e856db8f39b2f28f36e Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 28 May 2021 18:45:22 +0200 Subject: [mod] move all default settings into searx.settings_defaults --- searx/__init__.py | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) (limited to 'searx/__init__.py') diff --git a/searx/__init__.py b/searx/__init__.py index 6aac98713..ded0ff2f5 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -17,37 +17,18 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >. import logging import searx.settings_loader -from os import environ -from os.path import realpath, dirname, join, abspath, isfile +from searx.settings_defaults import settings_set_defaults +from os.path import dirname, abspath searx_dir = abspath(dirname(__file__)) searx_parent_dir = abspath(dirname(dirname(__file__))) -engine_dir = dirname(realpath(__file__)) -static_path = abspath(join(dirname(__file__), 'static')) settings, settings_load_message = searx.settings_loader.load_settings() -if settings['ui']['static_path']: - static_path = settings['ui']['static_path'] - -''' -enable debug if -the environnement variable SEARX_DEBUG is 1 or true -(whatever the value in settings.yml) -or general.debug=True in settings.yml -disable debug if -the environnement variable SEARX_DEBUG is 0 or false -(whatever the value in settings.yml) -or general.debug=False in settings.yml -''' -searx_debug_env = environ.get('SEARX_DEBUG', '').lower() -if searx_debug_env == 'true' or searx_debug_env == '1': - searx_debug = True -elif searx_debug_env == 'false' or searx_debug_env == '0': - searx_debug = False -else: - searx_debug = settings.get('general', {}).get('debug') +if settings is not None: + settings = settings_set_defaults(settings) +searx_debug = settings['general']['debug'] if searx_debug: logging.basicConfig(level=logging.DEBUG) else: @@ -55,12 +36,13 @@ else: logger = logging.getLogger('searx') logger.info(settings_load_message) -logger.info('Initialisation done') -if 'SEARX_SECRET' in environ: - settings['server']['secret_key'] = environ['SEARX_SECRET'] -if 'SEARX_BIND_ADDRESS' in environ: - settings['server']['bind_address'] = environ['SEARX_BIND_ADDRESS'] +# log max_request_timeout +max_request_timeout = settings['outgoing']['max_request_timeout'] +if max_request_timeout is None: + logger.info('max_request_timeout=%s', repr(max_request_timeout)) +else: + logger.info('max_request_timeout=%i second(s)', max_request_timeout) class _brand_namespace: -- cgit v1.2.3 From 495d86b520c71e36c6f924a3a2421e499d159c2b Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Tue, 1 Jun 2021 16:03:19 +0200 Subject: [pylint] searx/__init__.py & searx/settings_defaults.py BTW: normalize some indentations in searx/settings_defaults.py Signed-off-by: Markus Heiser --- searx/__init__.py | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'searx/__init__.py') diff --git a/searx/__init__.py b/searx/__init__.py index ded0ff2f5..a65266de8 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -1,25 +1,12 @@ -''' -searx is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -searx is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with searx. If not, see < http://www.gnu.org/licenses/ >. - -(C) 2013- by Adam Tauber, -''' +# SPDX-License-Identifier: AGPL-3.0-or-later +# lint: pylint +# pylint: disable=missing-function-docstring, missing-module-docstring +from os.path import dirname, abspath import logging + import searx.settings_loader from searx.settings_defaults import settings_set_defaults -from os.path import dirname, abspath - searx_dir = abspath(dirname(__file__)) searx_parent_dir = abspath(dirname(dirname(__file__))) @@ -45,7 +32,7 @@ else: logger.info('max_request_timeout=%i second(s)', max_request_timeout) -class _brand_namespace: +class _brand_namespace: # pylint: disable=invalid-name @classmethod def get_val(cls, group, name, default=''): -- cgit v1.2.3