Improve logger rerouting and added decorator to log exceptions.

SDP/SDP/SDP.py

@@ -26,11 +26,12 @@ import numpy
 
 from wrappers import only_in_states, only_when_on, fault_on_error
 from opcua_connection import OPCUAConnection
-from lofar_logging import PythonLoggingMixin
+from lofar_logging import device_logging_to_python, log_exceptions
 
 __all__ = ["SDP", "main"]
 
-class SDP(Device, PythonLoggingMixin):
+@device_logging_to_python("SDP")
+class SDP(Device):
     """
 
     **Properties:**
@@ -193,6 +194,8 @@ class SDP(Device, PythonLoggingMixin):
 
         self.info_stream("Mapping OPC-UA MP/CP to attributes done.")
 
+    @log_exceptions
+    @DebugIt()
     def init_device(self):
         """ Instantiates the device in the OFF state. """
 
@@ -201,6 +204,7 @@ class SDP(Device, PythonLoggingMixin):
 
         self.set_state(DevState.OFF)
 
+    @log_exceptions
     def initialise(self):
         """Initialises the attributes and properties of the SDP."""
 
@@ -476,7 +480,6 @@ class SDP(Device, PythonLoggingMixin):
         """
         self.set_state(DevState.FAULT)
 
-
 # ----------
 # Run server
 # ----------

SDP/SDP/lofar_logging.py

 import logging
+import tango
+from functools import wraps
 
 def configured_logger(name=''):
     logger = logging.getLogger(name)
@@ -13,17 +15,31 @@ def configured_logger(name=''):
 
     return logger
 
-logger = configured_logger()
-
-class PythonLoggingMixin(object):
-    """ Also inherit this class to have your Tango Device log to python instead. """
-
-    # Monkey patch the python logger to replace the tango logger
-    debug_stream = logger.debug
-    info_stream = logger.info
-    warn_stream = logger.warning
-    warning_stream = logger.warning
-    error_stream = logger.error
-    fatal_stream = logger.fatal
-    critical_stream = logger.critical
-
+def device_logging_to_python(name = ''):
+    """ Call this on a Tango Device instance or class to have your Tango Device log to python instead. """
+
+    logger = configured_logger(name)
+
+    def inner(cls):
+        # Monkey patch the python logger to replace the tango logger
+        cls.debug_stream = logger.debug
+        cls.info_stream = logger.info
+        cls.warn_stream = logger.warning
+        cls.warning_stream = logger.warning
+        cls.error_stream = logger.error
+        cls.fatal_stream = logger.fatal
+        cls.critical_stream = logger.critical
+        return cls
+
+    return inner
+
+def log_exceptions(func):
+    @wraps(func)
+    def inner(self, *args, **kwargs):
+        try:
+            return func(self, *args, **kwargs)
+        except Exception as e:
+            self.error_stream("Caught exception: %s: %s", e.__class__.__name__, e, exc_info=1)
+            raise e
+
+    return inner