hive-service: Rename ServiceStatus as ServiceCondition

libs/service/hive/service/__init__.py

@@ -1 +1 @@
-from .restart_monitor import RestartMonitor, ServiceStatus
+from .restart_monitor import RestartMonitor, ServiceCondition

libs/service/hive/service/restart_monitor.py

@@ -12,22 +12,22 @@
 
 logger = logging.getLogger(__name__)
 
-ServiceStatus = Enum("ServiceStatus", "HEALTHY DUBIOUS IN_ERROR")
+ServiceCondition = Enum("ServiceCondition", "HEALTHY DUBIOUS IN_ERROR")
 
 
 @dataclass
 class RestartMonitor:
     try:
         DEFAULT_NAME = os.path.basename(sys.argv[0])
-        DEFAULT_INITIAL_STATUS = ServiceStatus.HEALTHY
+        DEFAULT_INITIAL_STATUS = ServiceCondition.HEALTHY
     except Exception as e:
         DEFAULT_NAME = f"[ERROR: {e}]"
-        DEFAULT_INITIAL_STATUS = ServiceStatus.DUBIOUS
+        DEFAULT_INITIAL_STATUS = ServiceCondition.DUBIOUS
 
     name: str = DEFAULT_NAME
     basename: str = ".hive-service-restart.stamp"
     dirname: str = field(default_factory=os.getcwd)
-    status: ServiceStatus = DEFAULT_INITIAL_STATUS
+    status: ServiceCondition = DEFAULT_INITIAL_STATUS
     rapid_restart_cutoff: float = 5 * MINUTES
     rapid_restart_cooldown_time: Optional[float] = None
 
@@ -54,15 +54,15 @@ def __post_init__(self):
         try:
             self._run()
         except Exception:
-            self.status = ServiceStatus.IN_ERROR
+            self.status = ServiceCondition.IN_ERROR
             self.log_exception()
 
     def log(self, message, level=logging.INFO):
-        if self.status is not ServiceStatus.IN_ERROR:
+        if self.status is not ServiceCondition.IN_ERROR:
             if level > logging.WARNING:
-                self.status = ServiceStatus.IN_ERROR
+                self.status = ServiceCondition.IN_ERROR
             elif level > logging.INFO:
-                self.status = ServiceStatus.DUBIOUS
+                self.status = ServiceCondition.DUBIOUS
         logger.log(level, message)
         self._messages.append(message)
 
@@ -80,7 +80,7 @@ def log_rapid_cycling(self, interval: float):
         self.log_error("is restarting rapidly")
 
     def log_exception(self):
-        self.status = ServiceStatus.IN_ERROR
+        self.status = ServiceCondition.IN_ERROR
         logger.exception("LOGGED EXCEPTION")
 
     @property

libs/service/tests/test_restart_monitor.py

@@ -1,6 +1,6 @@
 import os
 
-from hive.service import RestartMonitor, ServiceStatus
+from hive.service import RestartMonitor, ServiceCondition
 
 
 def test_init():
@@ -10,7 +10,7 @@ def __post_init__(self):
 
     got = TestRestartMonitor()
     assert got.name == "pytest"
-    assert got.status == ServiceStatus.HEALTHY
+    assert got.status == ServiceCondition.HEALTHY
 
     basenames = tuple(map(os.path.basename, got.filenames))
     assert basenames == (

services/matrix-connector/hive/matrix_connector/sender.py

@@ -12,7 +12,7 @@
 from hive.common import ArgumentParser
 from hive.common.units import SECONDS, MINUTES
 from hive.messaging import Channel, blocking_connection
-from hive.service import RestartMonitor, ServiceStatus
+from hive.service import RestartMonitor, ServiceCondition
 
 logger = logging.getLogger(__name__)
 d = logger.debug
@@ -105,8 +105,8 @@ class ReportingRestartMonitor(RestartMonitor):
     @property
     def status_emoji(self):
         return {
-            ServiceStatus.HEALTHY: "",
-            ServiceStatus.DUBIOUS: ":white_question_mark:",
+            ServiceCondition.HEALTHY: "",
+            ServiceCondition.DUBIOUS: ":white_question_mark:",
         }.get(self.status, ":fire:")
 
     def report(self, sender: Sender):