Skip to content

Commit df56a01

Browse files
authored
Use usual __name__ idiom for monitoring DB manager logging (#3921)
Since PR #3817, the database manager has been started using multiprocessing spawn, rather than fork, as part of issue #3723, and since then, this special logger naming has been unnecessary. See PR #3644 for the same change on the htex interchange, including more detailed explanation/justification. # Changed Behaviour This PR probably doesn't change which log lines are logged now. It does open up the opportunity for Parsl helper functions to log things into the database manager log now. And log lines are now longer, because their topic is now "parsl.monitoring.db_manager", not "database_manager". ## Type of change - Code maintenance/cleanup
1 parent 57c9279 commit df56a01

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

parsl/monitoring/db_manager.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from parsl.process_loggers import wrap_with_logs
1919
from parsl.utils import setproctitle
2020

21-
logger = logging.getLogger("database_manager")
21+
logger = logging.getLogger(__name__)
2222

2323
X = TypeVar('X')
2424

@@ -294,8 +294,7 @@ def __init__(self,
294294
os.makedirs(self.run_dir, exist_ok=True)
295295

296296
set_file_logger(f"{self.run_dir}/database_manager.log", level=logging_level,
297-
format_string="%(asctime)s.%(msecs)03d %(name)s:%(lineno)d [%(levelname)s] [%(threadName)s %(thread)d] %(message)s",
298-
name="database_manager")
297+
format_string="%(asctime)s.%(msecs)03d %(name)s:%(lineno)d [%(levelname)s] [%(threadName)s %(thread)d] %(message)s")
299298

300299
logger.debug("Initializing Database Manager process")
301300

@@ -551,7 +550,7 @@ def start(self,
551550
if exception_happened:
552551
raise RuntimeError("An exception happened sometime during database processing and should have been logged in database_manager.log")
553552

554-
@wrap_with_logs(target="database_manager")
553+
@wrap_with_logs
555554
def _migrate_logs_to_internal(self, logs_queue: mpq.Queue, kill_event: threading.Event) -> None:
556555
logger.info("Starting _migrate_logs_to_internal")
557556

@@ -680,7 +679,7 @@ def close(self) -> None:
680679
self._kill_event.set()
681680

682681

683-
@wrap_with_logs(target="database_manager")
682+
@wrap_with_logs
684683
@typeguard.typechecked
685684
def dbm_starter(resource_msgs: mpq.Queue,
686685
db_url: str,

0 commit comments

Comments
 (0)