Merge branch 'L2SS-1783-suppress-exceptions-in-event-handlers' into v0.30.2-bugfixes

tangostationcontrol/tangostationcontrol/common/lofar_logging.py

@@ -251,7 +251,7 @@ def device_logging_to_python():
     return inner
 
 
-def log_exceptions(logger: logging.Logger = None):
+def log_exceptions(logger: logging.Logger = None, suppress: bool = False):
     """Decorator that logs all exceptions that the function raises."""
 
     def wrapper(func):
@@ -265,6 +265,7 @@ def log_exceptions(logger: logging.Logger = None):
                 )
 
                 # we can log but we cannot hide
+                if not suppress:
                     raise
 
         return inner

tangostationcontrol/tangostationcontrol/devices/base_device_classes/lofar_device.py

@@ -341,7 +341,7 @@ class LOFARDevice(Device):
                 merge_values[idx] = current_values[idx]
 
     @command(polling_period=DEFAULT_METRICS_POLLING_PERIOD)
-    @log_exceptions()
+    @log_exceptions(suppress=True)
     @DurationMetric()
     def poll_attributes(self):
         if self.attribute_poller:

tangostationcontrol/tangostationcontrol/devices/calibration.py

@@ -81,7 +81,7 @@ class Calibration(LOFARDevice):
 
         self.calibration_count_metric.get_metric([antenna_field_name]).inc()
 
-    @log_exceptions()
+    @log_exceptions(suppress=True)
     def _antennafield_changed_event(self, event):
         """Trigger on key external changes in AntennaField settings."""
 
@@ -104,7 +104,7 @@ class Calibration(LOFARDevice):
         # frequencies changed, so we need to recalibrate
         self._calibrate_antenna_field(event.device.name())
 
-    @log_exceptions()
+    @log_exceptions(suppress=True)
     def _clock_changed_event(self, event):
         """Trigger on external changes in frequency settings."""
         if event.err:

tangostationcontrol/tangostationcontrol/devices/sdp/beamlet.py

@@ -763,7 +763,7 @@ class Beamlet(OPCUADevice):
     # internal functions
     # --------
 
-    @log_exceptions()
+    @log_exceptions(suppress=True)
     def _frequency_change_event(self, event):
         """Trigger on external changes in frequency settings."""