diff --git a/src/finam/interfaces.py b/src/finam/interfaces.py index 7e2ea435da4cc15c8eb4864508e883d4a1050708..d12be145e06b430562ba5c240b6fee5fb1578332 100644 --- a/src/finam/interfaces.py +++ b/src/finam/interfaces.py @@ -57,6 +57,12 @@ class Loggable(ABC): def logger(self): """Logger for this component.""" if self._logger is None: + if ( + self.uses_base_logger_name + and hasattr(self, "base_logger_name") + and getattr(self, "base_logger_name") is None + ): + return logging.getLogger(self.logger_name) self._logger = logging.getLogger(self.logger_name) return self._logger diff --git a/src/finam/modules/debug.py b/src/finam/modules/debug.py index 7ca6598475d2f15a6646b39964f1a30c559b45f6..d2ad2e5477650459f633923c20ed0b0546631e9c 100644 --- a/src/finam/modules/debug.py +++ b/src/finam/modules/debug.py @@ -6,7 +6,6 @@ from ..data import tools from ..interfaces import ComponentStatus, IInput from ..sdk import CallbackInput, Component, TimeComponent from ..tools.date_helper import is_timedelta -from ..tools.log_helper import ErrorLogger class DebugConsumer(TimeComponent): @@ -73,11 +72,10 @@ class DebugConsumer(TimeComponent): ): super().__init__() - with ErrorLogger(self.logger): - if not isinstance(start, datetime): - raise ValueError("Start must be of type datetime") - if not is_timedelta(step): - raise ValueError("Step must be of type timedelta or relativedelta") + if not isinstance(start, datetime): + raise ValueError("Start must be of type datetime") + if not is_timedelta(step): + raise ValueError("Step must be of type timedelta or relativedelta") self._strip_data = strip_data self._log_data = None @@ -212,7 +210,6 @@ class DebugPushConsumer(Component): def __init__(self, inputs, callbacks=None, log_data=False, strip_data=True): super().__init__() - self._strip_data = strip_data self._log_data = None if isinstance(log_data, bool): diff --git a/src/finam/modules/generators.py b/src/finam/modules/generators.py index 538ac9ee447ab0ccb72c69c7da0d5a5a3c5c70ec..78a0635de17e4b2144f314e65a057854a961f63b 100644 --- a/src/finam/modules/generators.py +++ b/src/finam/modules/generators.py @@ -6,7 +6,6 @@ from finam.interfaces import ComponentStatus from ..sdk import Component, TimeComponent from ..tools.date_helper import is_timedelta -from ..tools.log_helper import ErrorLogger class CallbackGenerator(TimeComponent): @@ -54,11 +53,11 @@ class CallbackGenerator(TimeComponent): def __init__(self, callbacks, start, step): super().__init__() - with ErrorLogger(self.logger): - if not isinstance(start, datetime): - raise ValueError("Start must be of type datetime") - if not is_timedelta(step): - raise ValueError("Step must be of type timedelta or relativedelta") + + if not isinstance(start, datetime): + raise ValueError("Start must be of type datetime") + if not is_timedelta(step): + raise ValueError("Step must be of type timedelta or relativedelta") self._callbacks = callbacks self._step = step