From 11f349102d5d9aa4e25169370a737eded8773447 Mon Sep 17 00:00:00 2001 From: Christoph Schmidt <christoph.,schmidt@tugraz.at> Date: Thu, 4 Jan 2024 14:12:11 +0100 Subject: [PATCH] Fixed logging issues --- examples/example3/example3.py | 4 ++-- src/cmp/CBase.py | 2 +- src/cmp/CProcess.py | 1 + src/cmp/CProcessControl.py | 5 +++-- src/cmp/CResultRecord.py | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/example3/example3.py b/examples/example3/example3.py index 5134023..438f3e5 100644 --- a/examples/example3/example3.py +++ b/examples/example3/example3.py @@ -25,7 +25,7 @@ class Form(QDialog): super().__init__(parent) child_con = ChildProcessControl3(self, internal_log_level=logging.WARNING, log_file="log.log") - child_con.set_internal_log_level(logging.INFO) + #child_con.set_internal_log_level(logging.INFO) child_con.mp_finished.connect(self.updateUI) @@ -39,7 +39,7 @@ class Form(QDialog): self.lineedit.setFocus() self.setWindowTitle('Upper') # self.lineedit.returnPressed.connect(lambda: child_con.call_without_mp(1, 2, c=3)) - self.lineedit.returnPressed.connect(lambda: child_con.exception_call(1)) + self.lineedit.returnPressed.connect(lambda: child_con.test_call(1)) def updateUI(self, text): diff --git a/src/cmp/CBase.py b/src/cmp/CBase.py index 2bbef02..2966d2c 100644 --- a/src/cmp/CBase.py +++ b/src/cmp/CBase.py @@ -51,7 +51,7 @@ class CBase: if enabled: _internal_logger.disabled = False - _internal_logger.info(f"Logger {logger_name} created with handlers {_internal_logger.handlers} and has been enabled (Level {level}).") + _internal_logger.info(f"Logger {logger_name} created with ({len(_internal_logger.handlers)}) handlers and has been enabled (Level {level}).") else: _internal_logger.info(f"Logger {logger_name} created and has been disabled.") _internal_logger.disabled = True diff --git a/src/cmp/CProcess.py b/src/cmp/CProcess.py index acdebf4..5a065f8 100644 --- a/src/cmp/CProcess.py +++ b/src/cmp/CProcess.py @@ -66,6 +66,7 @@ class CProcess(CBase, Process): f"{os.getpid()}({self.__class__.__name__})", logger_handler=logging.handlers.QueueHandler(self.state_queue), logger_format="%(message)s", + enabled=True, to_file=self.log_file) diff --git a/src/cmp/CProcessControl.py b/src/cmp/CProcessControl.py index 407e770..65f2433 100644 --- a/src/cmp/CProcessControl.py +++ b/src/cmp/CProcessControl.py @@ -31,8 +31,9 @@ class CProcessControl(CBase, QObject): self.log_file = log_file self._internal_logger = self.create_new_logger(f"(cmp) {self.name}", to_file=self.log_file, enabled=internal_log, level=internal_log_level) + self.logger = self.create_new_logger(f"{self.__class__.__name__}({os.getpid()})", - to_file=self.log_file, enabled=internal_log, level=internal_log_level) + to_file=self.log_file, enabled=internal_log) if isinstance(parent, QWidget) or isinstance(parent, QWindow): parent.destroyed.connect(lambda: self.safe_exit(reason="Parent destroyed.")) @@ -87,7 +88,7 @@ class CProcessControl(CBase, QObject): # self._child.register_kill_flag(self._child_kill_flag) self._child_process_pid = child.pid self._child.start() - self._internal_logger.debug(f"Child process {self._child.name} created.") + self._internal_logger.info(f"Child process {self._child.name} created.") self.thread_manager.start(self._monitor_result_state) @property diff --git a/src/cmp/CResultRecord.py b/src/cmp/CResultRecord.py index af26e01..0bf3742 100644 --- a/src/cmp/CResultRecord.py +++ b/src/cmp/CResultRecord.py @@ -18,11 +18,11 @@ class CResultRecord: logger = logging.getLogger(f"{__name__} - fallback") if self.signal_name is None: - logger.info(f"Function {self.function_name} returned {self.result}. " + logger.debug(f"Function {self.function_name} returned {self.result}. " f"No signal to emit.") return if hasattr(class_object, '_internal_logger'): - logger.info(f"Function {self.function_name} returned {self.result}. " + logger.debug(f"Function {self.function_name} returned {self.result}. " f"Emitting {self} in {class_object.__class__.__name__}.") emitter = getattr(class_object, self.signal_name).emit if isinstance(self.result, tuple): -- GitLab