8 files changed, 18 insertions, 16 deletions
diff --git a/searx/engines/__init__.py b/searx/engines/__init__.py
index 154cd605f..e0b5796e4 100644
--- a/searx/engines/__init__.py
+++ b/searx/engines/__init__.py
@@ -110,10 +110,26 @@ def load_engine(engine_data):
     if is_missing_required_attributes(engine):
         return None
 
-    engine.logger = logger.getChild(engine_name)
+    set_loggers(engine, engine_name)
+
     return engine
 
 
+def set_loggers(engine, engine_name):
+    # set the logger for engine
+    engine.logger = logger.getChild(engine_name)
+    # the engine may have load some other engines
+    # may sure the logger is initialized
+    for module_name, module in sys.modules.items():
+        if (
+            module_name.startswith("searx.engines")
+            and module_name != "searx.engines.__init__"
+            and not hasattr(module, "logger")
+        ):
+            module_engine_name = module_name.split(".")[-1]
+            module.logger = logger.getChild(module_engine_name)
+
+
 def update_engine_attributes(engine, engine_data):
     # set engine attributes from engine_data
     for param_name, param_value in engine_data.items():
diff --git a/searx/engines/command.py b/searx/engines/command.py
index 33270d245..aca379c67 100644
--- a/searx/engines/command.py
+++ b/searx/engines/command.py
@@ -35,7 +35,7 @@ def init(engine_settings):
     if 'command' not in engine_settings:
         raise ValueError('engine command : missing configuration key: command')
 
-    global command, working_dir, result_template, delimiter, parse_regex, timeout, environment_variables
+    global command, working_dir, delimiter, parse_regex, environment_variables
 
     command = engine_settings['command']
 
diff --git a/searx/engines/demo_offline.py b/searx/engines/demo_offline.py
index 06609d2c3..a4a632180 100644
--- a/searx/engines/demo_offline.py
+++ b/searx/engines/demo_offline.py
@@ -56,7 +56,6 @@ def search(query, request_params):
     results.
 
     """
-    global _my_offline_engine  # pylint: disable=global-statement
     ret_val = []
 
     result_list = json.loads(_my_offline_engine)
diff --git a/searx/engines/openstreetmap.py b/searx/engines/openstreetmap.py
index 78c15320a..9f1fe94c9 100644
--- a/searx/engines/openstreetmap.py
+++ b/searx/engines/openstreetmap.py
@@ -438,8 +438,3 @@ def get_key_label(key_name, lang):
         if labels is None:
             return None
     return get_label(labels, lang)
-
-
-def init(_):
-    import searx.engines.wikidata  # pylint: disable=import-outside-toplevel
-    searx.engines.wikidata.logger = logger
diff --git a/searx/engines/redis_server.py b/searx/engines/redis_server.py
index a48f0775b..f9726033d 100644
--- a/searx/engines/redis_server.py
+++ b/searx/engines/redis_server.py
@@ -31,8 +31,6 @@ def init(_engine_settings):
     )
 
 def search(query, _params):
-    global _redis_client  # pylint: disable=global-statement
-
     if not exact_match_only:
         return search_keys(query)
 
@@ -55,8 +53,6 @@ def search(query, _params):
     return []
 
 def search_keys(query):
-    global _redis_client  # pylint: disable=global-statement
-
     ret = []
     for key in _redis_client.scan_iter(
             match='*{}*'.format(query)
diff --git a/searx/engines/sqlite.py b/searx/engines/sqlite.py
index 292448602..43a85efbb 100644
--- a/searx/engines/sqlite.py
+++ b/searx/engines/sqlite.py
@@ -35,7 +35,6 @@ def sqlite_cursor():
     * https://docs.python.org/3/library/sqlite3.html#sqlite3.connect
     * https://www.sqlite.org/uri.html
     """
-    global database  # pylint: disable=global-statement
     uri = 'file:' + database + '?mode=ro'
     with contextlib.closing(sqlite3.connect(uri, uri=True)) as connect:
         connect.row_factory = sqlite3.Row
@@ -44,7 +43,6 @@ def sqlite_cursor():
 
 
 def search(query, params):
-    global query_str, result_template  # pylint: disable=global-statement
     results = []
 
     query_params = {
diff --git a/searx/engines/xpath.py b/searx/engines/xpath.py
index 8338d5301..08677b708 100644
--- a/searx/engines/xpath.py
+++ b/searx/engines/xpath.py
@@ -173,7 +173,6 @@ def request(query, params):
 
     params['url'] = search_url.format(**fargs)
     params['soft_max_redirects'] = soft_max_redirects
-    logger.debug("query_url --> %s", params['url'])
 
     return params
 
diff --git a/searx/engines/yggtorrent.py b/searx/engines/yggtorrent.py
index ca008c472..31a0408b8 100644
--- a/searx/engines/yggtorrent.py
+++ b/searx/engines/yggtorrent.py
@@ -37,7 +37,6 @@ cookies = dict()
 
 
 def init(engine_settings=None):
-    global cookies
     # initial cookies
     resp = http_get(url, allow_redirects=False)
     if resp.ok: