summaryrefslogtreecommitdiff
path: root/searx/search/processors/abstract.py
diff options
context:
space:
mode:
authorAlexandre Flament <alex@al-f.net>2021-09-06 19:46:08 +0200
committerAlexandre Flament <alex@al-f.net>2021-09-10 21:49:34 +0200
commitb513917ef94d2f18e6db3228363f8089ce1ba08a (patch)
tree7df26e78c31a6785f972d8c68e500098176c9a8a /searx/search/processors/abstract.py
parent76e0f6807ccddb12ca9efe3b2343735d6e1777d4 (diff)
[mod] searx.metrics & searx.search: use the engine loggers
metrics & processors use the engine logger
Diffstat (limited to 'searx/search/processors/abstract.py')
-rw-r--r--searx/search/processors/abstract.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/searx/search/processors/abstract.py b/searx/search/processors/abstract.py
index c8d81c026..b5fa063fd 100644
--- a/searx/search/processors/abstract.py
+++ b/searx/search/processors/abstract.py
@@ -9,8 +9,8 @@ import threading
from abc import abstractmethod, ABC
from timeit import default_timer
-from searx import logger
-from searx.engines import settings
+from searx import settings, logger
+from searx.engines import engines
from searx.network import get_time_for_thread, get_network
from searx.metrics import histogram_observe, counter_inc, count_exception, count_error
from searx.exceptions import SearxEngineAccessDeniedException, SearxEngineResponseException
@@ -43,7 +43,7 @@ class SuspendedStatus:
self.continuous_errors * settings['search']['ban_time_on_fail'])
self.suspend_end_time = default_timer() + suspended_time
self.suspend_reason = suspend_reason
- logger.debug('Suspend engine for %i seconds', suspended_time)
+ logger.debug('Suspend for %i seconds', suspended_time)
def resume(self):
with self.lock:
@@ -56,11 +56,12 @@ class SuspendedStatus:
class EngineProcessor(ABC):
"""Base classes used for all types of reqest processores."""
- __slots__ = 'engine', 'engine_name', 'lock', 'suspended_status'
+ __slots__ = 'engine', 'engine_name', 'lock', 'suspended_status', 'logger'
def __init__(self, engine, engine_name):
self.engine = engine
self.engine_name = engine_name
+ self.logger = engines[engine_name].logger
key = get_network(self.engine_name)
key = id(key) if key else self.engine_name
self.suspended_status = SUSPENDED_STATUS.setdefault(key, SuspendedStatus())
@@ -69,11 +70,11 @@ class EngineProcessor(ABC):
try:
self.engine.init(get_engine_from_settings(self.engine_name))
except SearxEngineResponseException as exc:
- logger.warn('%s engine: Fail to initialize // %s', self.engine_name, exc)
+ self.logger.warn('Fail to initialize // %s', exc)
except Exception: # pylint: disable=broad-except
- logger.exception('%s engine: Fail to initialize', self.engine_name)
+ self.logger.exception('Fail to initialize')
else:
- logger.debug('%s engine: Initialized', self.engine_name)
+ self.logger.debug('Initialized')
@property
def has_initialize_function(self):