From 1c6946be4eda8fa8afdd674254a8d47f54e24f0f Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 14 Aug 2025 08:18:10 +0200 Subject: [PATCH 1/3] fix logging of stdout und stderr --- packages/helpermodules/command.py | 5 +++-- packages/helpermodules/utils/run_command.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index 4fc3d5d207..cf9726cb44 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -969,9 +969,10 @@ def __exit__(self, exception_type, exception, exception_traceback) -> bool: log.error({traceback.format_exc()}) return True elif isinstance(exception, subprocess.CalledProcessError): - log.debug(exception.stdout) pub_user_message(self.payload, self.connection_id, - f'Fehler-Status: {exception.returncode}
Meldung: {exception.stderr}', + (f'Fehler-Status: {exception.returncode}
Meldung: ' + f'{exception.stderr if exception.stderr else ""} ' + f'{exception.output if exception.output else ""}'), MessageType.ERROR) return True else: diff --git a/packages/helpermodules/utils/run_command.py b/packages/helpermodules/utils/run_command.py index 3aa98f9473..b340308c10 100644 --- a/packages/helpermodules/utils/run_command.py +++ b/packages/helpermodules/utils/run_command.py @@ -30,7 +30,9 @@ def run_command(command, process_exception: bool = False): return result.stdout except subprocess.CalledProcessError as e: if process_exception: - log.debug(e.stdout) - log.exception(e.stderr) + if e.output is not None: + log.exception(e.stdout) + if e.stderr is not None: + log.exception(e.stderr) else: raise e From 0d28214aeca919956cf13fb86fcecc7d5e5c4187 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 14 Aug 2025 08:27:55 +0200 Subject: [PATCH 2/3] fix --- packages/helpermodules/command.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py index cf9726cb44..3c9c7fe17a 100644 --- a/packages/helpermodules/command.py +++ b/packages/helpermodules/command.py @@ -963,18 +963,18 @@ def __enter__(self): return None def __exit__(self, exception_type, exception, exception_traceback) -> bool: - if isinstance(exception, Exception): - pub_user_message(self.payload, self.connection_id, - f'Es ist ein interner Fehler aufgetreten: {exception}', MessageType.ERROR) - log.error({traceback.format_exc()}) - return True - elif isinstance(exception, subprocess.CalledProcessError): + if isinstance(exception, subprocess.CalledProcessError): pub_user_message(self.payload, self.connection_id, (f'Fehler-Status: {exception.returncode}
Meldung: ' f'{exception.stderr if exception.stderr else ""} ' f'{exception.output if exception.output else ""}'), MessageType.ERROR) return True + elif isinstance(exception, Exception): + pub_user_message(self.payload, self.connection_id, + f'Es ist ein interner Fehler aufgetreten: {exception}', MessageType.ERROR) + log.error({traceback.format_exc()}) + return True else: return False From 1368de2f42b12afb186bd5a7848cb16f037bb0e8 Mon Sep 17 00:00:00 2001 From: LKuemmel Date: Thu, 14 Aug 2025 08:53:00 +0200 Subject: [PATCH 3/3] simplify --- packages/helpermodules/utils/run_command.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/helpermodules/utils/run_command.py b/packages/helpermodules/utils/run_command.py index b340308c10..cf8d963670 100644 --- a/packages/helpermodules/utils/run_command.py +++ b/packages/helpermodules/utils/run_command.py @@ -31,7 +31,7 @@ def run_command(command, process_exception: bool = False): except subprocess.CalledProcessError as e: if process_exception: if e.output is not None: - log.exception(e.stdout) + log.exception(e.output) if e.stderr is not None: log.exception(e.stderr) else: