Replace obsolete HTCondor references

Author: isikhar

src/dlstbx/services/htcondorstats.py

@@ -9,29 +9,29 @@
 from dlstbx.util.iris import get_minio_client
 
 
-class HTCondorStats(CommonService):
+class CloudStats(CommonService):
     """
-    A service that collects HTCondor and S3 Echo object store utilization
+    A service that collects Cloud and S3 Echo object store utilization
     statistics.
     """
 
     # Human readable service name
-    _service_name = "HTCondorstats"
+    _service_name = "Cloudstats"
 
     # Logger name
-    _logger_name = "dlstbx.services.htcondorstats"
+    _logger_name = "dlstbx.services.cloudstats"
 
     # STFC S3 Echo credentials
     _s3echo_credentials = "/dls_sw/apps/zocalo/secrets/credentials-echo-mx.cfg"
 
     def initializing(self):
         """
-        Register callback function to collect HTCondor and S3 Echo stats.
+        Register callback function to collect Cloud and S3 Echo stats.
         """
-        self.log.info("HTCondorstats starting")
+        self.log.info("Cloudstats starting")
 
         self.minio_client: minio.Minio = get_minio_client(
-            HTCondorStats._s3echo_credentials
+            CloudStats._s3echo_credentials
         )
 
         self._register_idle(30, self.update_slurm_statistics)

src/dlstbx/services/htcondorwatcher.py

@@ -11,32 +11,32 @@
 from dlstbx.util.profiler import Profiler
 
 
-class HTCondorWatcher(CommonService):
+class CloudWatcher(CommonService):
     """
-    A service that waits for HTCondor jobs to complete and notifies interested
+    A service that waits for Cloud jobs to complete and notifies interested
     parties when they do, or don't.
     """
 
     # Human readable service name
-    _service_name = "HTCondorwatcher"
+    _service_name = "Cloudwatcher"
 
     # Logger name
-    _logger_name = "dlstbx.services.htcondorwatcher"
+    _logger_name = "dlstbx.services.cloudwatcher"
 
     def initializing(self):
         """
-        Subscribe to the htcondorwatcher queue. Received messages must be
+        Subscribe to the cloudwatcher queue. Received messages must be
         acknowledged.
         """
-        self.log.info("HTCondorwatcher starting")
+        self.log.info("Cloudwatcher starting")
 
         self.slurm_api: slurm.SlurmRestApi = (
             slurm.SlurmRestApi.from_zocalo_configuration(self.config, cluster="iris")
         )
 
         workflows.recipe.wrap_subscribe(
             self._transport,
-            "htcondorwatcher",
+            "cloudwatcher",
             self.watch_jobs,
             acknowledgement=True,
             log_extender=self.extend_log,
@@ -167,7 +167,7 @@ def watch_jobs(self, rw, header, message):
                     timeoutlog = self.log.info
 
                 timeoutlog(
-                    "HTCondorwatcher for jobs %s timed out after %.1f seconds (%d of %d jobs found after %.1f seconds)",
+                    "Cloudwatcher for jobs %s timed out after %.1f seconds (%d of %d jobs found after %.1f seconds)",
                     pformat(seen_jobs),
                     runtime,
                     len(seen_jobs),