From 099e41581afb767a4e49888def8460e0e123b748 Mon Sep 17 00:00:00 2001 From: Jim Hawkins Date: Fri, 3 May 2024 09:59:51 +0100 Subject: [PATCH] Update for new installer PID interface, and rationalise some log messages Signed-off-by: Jim Hawkins --- src/task_killer.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/task_killer.py b/src/task_killer.py index 3ac9ff5..5a7e478 100644 --- a/src/task_killer.py +++ b/src/task_killer.py @@ -71,20 +71,21 @@ def exit(self): exit() def _exempt_PID(self): - pid = UpdateManager().installerPID + pid = UpdateManager().state.installerPID if pid is not None: yield pid def _terminate_tree(self, process, exempt): - logger.info(f'(, {process}, {exempt})') + logger.info(f'{process=} {exempt=}') if process.pid in exempt: - logger.info(f"Exempt:{process}.") + logger.info(f"Exempt {process.pid=}") return for child in process.children(): - logger.info(f'Parent {process} Child {child}') + logger.info(f'Parent {process} {child=}') self._terminate_tree(child, exempt) - logger.info(f'SIGTERM {process}') + logger.info(f'SIGTERM {process.pid=}') try: process.send_signal(signal.SIGTERM) except NoSuchProcess: - pass + logger.info(f'No such process {process.pid=}') +