Merge branch 'reduce-logspam' into 'master'

Reduce logspam

See merge request !383

tangostationcontrol/tangostationcontrol/common/lofar_logging.py

@@ -140,7 +140,7 @@ def configure_logger(logger: logging.Logger=None, log_extra=None, debug=False):
     # Always also log the hostname because it makes the origin of the log clear.
     hostname = socket.gethostname()
 
-    formatter = logging.Formatter(fmt = '%(asctime)s.%(msecs)d %(levelname)s - HOST="{}" DEVICE="%(tango_device)s" PID="%(process)d" TNAME="%(threadName)s" FILE="%(pathname)s" LINE="%(lineno)d" FUNC="%(funcName)s" MSG="%(message)s"'.format(hostname), datefmt = '%Y-%m-%dT%H:%M:%S')
+    formatter = logging.Formatter(fmt = '%(asctime)s.%(msecs)d %(levelname)s - %(tango_device)s: %(message)s [%(funcName)s in %(filename)s:%(lineno)d]'.format(hostname), datefmt = '%Y-%m-%dT%H:%M:%S')
     handler.setFormatter(formatter)
     handler.addFilter(LogSuppressErrorSpam())
     handler.addFilter(LogAnnotator())
@@ -171,6 +171,8 @@ def configure_logger(logger: logging.Logger=None, log_extra=None, debug=False):
     except Exception:
         logger.exception("Cannot forward logs to ELK.")
 
+    # Don't log to Tango to reduce log spam
+    """
     # Log to Tango
     try:
         handler = TangoLoggingHandler()
@@ -179,6 +181,7 @@ def configure_logger(logger: logging.Logger=None, log_extra=None, debug=False):
         logger.addHandler(handler)
     except Exception:
         logger.exception("Cannot forward logs to Tango.")
+    """
 
     return logger
 

tangostationcontrol/tangostationcontrol/test/common/test_lofar_logging.py

@@ -9,6 +9,7 @@
 
 from unittest import mock
 import logging
+import unittest
 
 from tango.server import Device
 from tango import device_server
@@ -68,7 +69,7 @@ class TestLofarLogging(base.TestCase):
         self.assertIn("tango_device", self.memory_handler.records[0].__dict__)
         self.assertIn("software_version", self.memory_handler.records[0].__dict__)
 
-
+    @unittest.skip("Logs are not sent to Tango device currently, to reduce logspam")
     def test_configure_logging_uses_tango_device(self):
         """ Test whether log records get annotated with the active Tango device after using configure_logger(), and whether logs get forwarded to it. """