Skip to content

Commit c3d2095

Browse files
committed
WIP: remove delegation
1 parent 370e104 commit c3d2095

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

src/stpipe/log.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ def record_logs(level=logging.NOTSET, formatter=None):
291291
else:
292292
handler = RecordingHandler(level=level)
293293
handler.setFormatter(formatter)
294-
logger = getLogger(STPIPE_ROOT_LOGGER)
294+
logger = getLogger()
295295
logger.addHandler(handler)
296296
try:
297297
yield handler.log_records
@@ -303,9 +303,9 @@ def record_logs(level=logging.NOTSET, formatter=None):
303303
# uses the `delegator` instance to change what the current Step logger
304304
# is.
305305
log = getLogger()
306-
delegator = DelegationHandler()
307-
delegator.log = getLogger(STPIPE_ROOT_LOGGER)
308-
log.addHandler(delegator)
306+
#delegator = DelegationHandler()
307+
#delegator.log = getLogger(STPIPE_ROOT_LOGGER)
308+
#log.addHandler(delegator)
309309

310310
logging_config_file = _find_logging_config_file()
311311
if logging_config_file is not None:

src/stpipe/pipeline.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"""
44

55
from collections.abc import Sequence
6+
import logging
67
from os.path import dirname, join
78
from typing import ClassVar
89

@@ -15,7 +16,8 @@
1516

1617
# For classmethods, the logger to use is the
1718
# delegator, since the pipeline has not yet been instantiated.
18-
logger = log.delegator.log
19+
#logger = log.delegator.log
20+
logger = logging.getLogger(log.STPIPE_ROOT_LOGGER)
1921

2022

2123
class Pipeline(Step):

src/stpipe/step.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,8 @@ def run(self, *args):
426426
self._log_records = log_records
427427

428428
# Make generic log messages go to this step's logger
429-
orig_log = log.delegator.log
430-
log.delegator.log = self.log
429+
#orig_log = log.delegator.log
430+
#log.delegator.log = self.log
431431

432432
step_result = None
433433

@@ -572,7 +572,8 @@ def set_skipped(model):
572572
if not self.skip:
573573
self.log.info("Step %s done", self.name)
574574
finally:
575-
log.delegator.log = orig_log
575+
#log.delegator.log = orig_log
576+
pass
576577

577578
return step_result
578579

0 commit comments

Comments
 (0)