Merge branch 'master' into 2021-04-16-Branched_from_master-APSCTL_device

devices/src/wrappers.py → devices/util/wrappers.py

@@ -22,32 +22,38 @@ def only_in_states(allowed_states):
 
     return wrapper
 
-def only_when_on(func):
+def only_when_on():
     """
       Wrapper to call and return the wrapped function if the device is
       in the ON state. Otherwise None is returned and nothing
       will be called.
     """
-    @wraps(func)
-    def when_on_wrapper(self, *args, **kwargs):
-        if self.get_state() == DevState.ON:
-            return func(self, *args, **kwargs)
+    def inner(func):
+        @wraps(func)
+        def when_on_wrapper(self, *args, **kwargs):
+            if self.get_state() == DevState.ON:
+                return func(self, *args, **kwargs)
+
+            return None
 
-        return None
+        return when_on_wrapper
 
-    return when_on_wrapper
+    return inner
 
-def fault_on_error(func):
+def fault_on_error():
     """
       Wrapper to catch exceptions. Sets the device in a FAULT state if any occurs.
     """
-    @wraps(func)
-    def error_wrapper(self, *args, **kwargs):
-        try:
-            return func(self, *args, **kwargs)
-        except Exception as e:
-            self.error_stream("Function failed.  Trace: %s", traceback.format_exc())
-            self.Fault()
-            return None
+    def inner(func):
+        @wraps(func)
+        def error_wrapper(self, *args, **kwargs):
+            try:
+                return func(self, *args, **kwargs)
+            except Exception as e:
+                self.error_stream("Function failed.  Trace: %s", traceback.format_exc())
+                self.Fault()
+                return None
+
+        return error_wrapper
 
-    return error_wrapper
+    return inner

docker-compose/archiver.yml

 version: '2'
 
 services:
-  maria-db:
+  archiver-maria-db:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mariadb_hdbpp:latest
     container_name: archiver-maria-db
     network_mode: ${NETWORK_MODE}
@@ -23,7 +23,7 @@ services:
       depends_on:
         - databaseds
         - dsconfig
-        - maria-db
+        - archiver-maria-db
       environment:
         - TANGO_HOST=${TANGO_HOST}
         - HdbManager=archiving/hdbpp/confmanager01
@@ -40,7 +40,7 @@ services:
       depends_on:
         - databaseds
         - dsconfig
-        - maria-db
+        - archiver-maria-db
       environment:
         - TANGO_HOST=${TANGO_HOST}
         - HdbManager=archiving/hdbpp/confmanager01

docker-compose/hdbpp_viewer.yml

@@ -16,7 +16,7 @@ services:
     depends_on:
       - databaseds
       - dsconfig
-      - maria-db
+      - archiver-maria-db
       - hdbpp-es
       - hdbpp-cm
     volumes: