Small enhancements following review

src/offspot_demo/setup.py

@@ -74,10 +74,14 @@ def setup_check_systemd_service(
 ) -> None:
     """Check status of the systemd unit
 
-    By default, check at least that the unit is loaded properly (i.e. parsing is ok)
-    If check_running is True, it also checks that the unit is running
-    If check_enabled is True, it also checks that the unit is enabled
-    If check_waiting is True, it also checks that the unit is waiting
+    The minimal check consists in ensuring that the systemd unit is properly loaded (no
+    parsing issue, no unknown parameter, ...)
+
+    Parameters:
+        unit_fullname: full name of the systemd unit to check (e.g. my-timer.timer)
+        check_running: also check that systemd unit is running
+        check_waiting: also check that systemd unit is waiting (for timers typically)
+        check_enabled: also check that systemd unit is enabled
     """
 
     try:
@@ -87,18 +91,14 @@ def setup_check_systemd_service(
             check_enabled=check_enabled,
             check_waiting=check_waiting,
         )
-    except SystemdNotLoadedError as exc:
-        logger.error(f"systemd unit not loaded properly:\n{exc.stdout}")
-        sys.exit(2)
-    except SystemdNotRunningError as exc:
-        logger.error(f"systemd unit not running:\n{exc.stdout}")
-        sys.exit(3)
-    except SystemdNotWaitingError as exc:
-        logger.error(f"systemd unit not waiting:\n{exc.stdout}")
-        sys.exit(4)
-    except SystemdNotEnabledError as exc:
-        logger.error(f"systemd unit not enabled:\n{exc.stdout}")
-        sys.exit(5)
+    except (
+        SystemdNotLoadedError,
+        SystemdNotRunningError,
+        SystemdNotWaitingError,
+        SystemdNotEnabledError,
+    ) as exc:
+        logger.error(f"systemd check failed for {unit_fullname}:\n{exc.stdout}")
+        sys.exit(exc.return_code)
 
     logger.info("\tsystemd unit is properly loaded")
     if check_enabled:

src/offspot_demo/utils/systemd.py

@@ -11,19 +11,19 @@ def __init__(self, stdout: str, *args: object) -> None:
 
 
 class SystemdNotRunningError(SystemdError):
-    pass
+    return_code = 3
 
 
 class SystemdNotWaitingError(SystemdError):
-    pass
+    return_code = 4
 
 
 class SystemdNotEnabledError(SystemdError):
-    pass
+    return_code = 5
 
 
 class SystemdNotLoadedError(SystemdError):
-    pass
+    return_code = 2
 
 
 def check_systemd_service(
@@ -35,14 +35,20 @@ def check_systemd_service(
 ) -> subprocess.CompletedProcess[str]:
     """Check status of the systemd unit
 
-    By default, check at least that the unit is loaded properly (i.e. parsing is ok),
-    otherwise a SystemdNotLoadedError is raised.
-    If check_running is True, it also checks that the unit is running, otherwise a
-    SystemdNotRunningError is raiase
-    If check_enabled is True, it also checks that the unit is enabled, otherwise a
-    SystemdNotEnabledError is raiase
-    If check_waiting is True, it also checks that the unit is waiting, otherwise a
-    SystemdNotWaitingError is raiase
+    The minimal check consists in ensuring that the systemd unit is properly loaded (no
+    parsing issue, no unknown parameter, ...)
+
+    Parameters:
+        unit_fullname: full name of the systemd unit to check (e.g. my-timer.timer)
+        check_running: also check that systemd unit is running
+        check_waiting: also check that systemd unit is waiting (for timers typically)
+        check_enabled: also check that systemd unit is enabled
+
+    Raises:
+        SystemdNotLoadedError: if unit is not properly loaded
+        SystemdNotRunningError: if unit is not running ; when using check_running
+        SystemdNotEnabledError: if unit is not enabled ; when using check_enabled
+        SystemdNotWaitingError: if unit is not waiting ; when using check_waiting
     """
     process = run_command(
         [

src/offspot_demo/watcher.py

@@ -22,7 +22,7 @@ def get_new_deploy_url() -> str | None:
 
     Returns None otherwise.
     """
-    if not (LAST_IMAGE_DEPLOYED_PATH).exists():
+    if not LAST_IMAGE_DEPLOYED_PATH.exists():
         last_image_fetched = None
     else:
         last_image_fetched = LAST_IMAGE_DEPLOYED_PATH.read_text()