Merge pull request #6967 from aldbr/v8.1_FEAT_loggingChanges

[8.1] feat logging changes

Author: fstagni

docs/source/AdministratorGuide/Resources/messagequeues.rst

@@ -95,9 +95,6 @@ like described in :ref:`development_use_mq`, for example::
      message = result['Value']
 
 
-In order not to spam the logs, the log output of Stomp is always silence, unless the environment variable `DIRAC_DEBUG_STOMP` is set to any value.
-
-
 Message Queue nomenclature in DIRAC
 -----------------------------------
 

docs/source/AdministratorGuide/ServerInstallations/environment_variable_configuration.rst

@@ -14,9 +14,6 @@ DIRAC_DEBUG_DENCODE_CALLSTACK
 DIRAC_DEBUG_M2CRYPTO
   If ``true`` or ``yes``, print a lot of SSL debug output
 
-DIRAC_DEBUG_STOMP
-  If set, the stomp library will print out debug information
-
 DIRAC_DEPRECATED_FAIL
   If set, the use of functions or objects that are marked ``@deprecated`` will fail. Useful for example in continuous
   integration tests against future versions of DIRAC

src/DIRAC/ConfigurationSystem/Client/LocalConfiguration.py

@@ -311,6 +311,7 @@ def initialize(self, *, returnErrors=False):
 
     def __initLogger(self, componentName, logSection, forceInit=False):
         gLogger.initialize(componentName, logSection, forceInit=forceInit)
+        gLogger.disableLogsFromExternalLibs()
 
         if self.__debugMode == 1:
             gLogger.setLevel("VERBOSE")
@@ -320,6 +321,7 @@ def __initLogger(self, componentName, logSection, forceInit=False):
         elif self.__debugMode >= 3:
             gLogger.setLevel("DEBUG")
             gLogger.showHeaders(True)
+            gLogger.enableLogsFromExternalLibs()
 
     def loadUserData(self):
         """

src/DIRAC/FrameworkSystem/private/standardLogging/Formatter/BaseFormatter.py

@@ -2,7 +2,7 @@
 BaseFormatter
 """
 import logging
-import sys
+import time
 
 
 class BaseFormatter(logging.Formatter):
@@ -23,6 +23,9 @@ def __init__(self, fmt=None, datefmt=None):
         :param str fmt: log format: "%(asctime)s UTC %(name)s %(levelname)s: %(message)"
         :param str datefmt: date format: "%Y-%m-%d %H:%M:%S"
         """
+        # Initialization of the UTC time
+        # Actually, time.gmtime is equal to UTC time: it has its DST flag to 0 which means there is no clock advance
+        self.converter = time.gmtime
         super().__init__()
 
     def format(self, record):
@@ -43,7 +46,7 @@ def format(self, record):
 
         if record.headerIsShown:
             if record.timeStampIsShown:
-                timeStamp = "%(asctime)s UTC "
+                timeStamp = "%(asctime)s "
             if record.contextIsShown:
                 contextComponentList = ["%(componentname)s%(customname)s"]
 
@@ -63,5 +66,14 @@ def format(self, record):
         fmt += "%(message)s%(spacer)s%(varmessage)s"
 
         self._style._fmt = fmt  # pylint: disable=no-member
-        self.datefmt = "%Y-%m-%d %H:%M:%S"
         return super().format(record)
+
+    def formatTime(self, record, datefmt=None):
+        """:py:meth:`logging.Formatter.formatTime` with microsecond precision by default"""
+        ct = self.converter(record.created)
+        if datefmt:
+            s = time.strftime(datefmt, ct)
+        else:
+            t = time.strftime("%Y-%m-%dT%H:%M:%S", ct)
+            s = "%s,%06dZ" % (t, (record.created - int(record.created)) * 1e6)
+        return s

src/DIRAC/FrameworkSystem/private/standardLogging/Formatter/MicrosecondJsonFormatter.py

@@ -10,6 +10,10 @@ def __init__(self, *args, **kwargs):
         Add to the list of attributes we don't want to see
         all the DIRAC spefic log formating instructions
         """
+        # Initialization of the UTC time
+        # Actually, time.gmtime is equal to UTC time: it has its DST flag to 0 which means there is no clock advance
+        self.converter = time.gmtime
+
         if "reserved_attrs" not in kwargs:
             kwargs["reserved_attrs"] = RESERVED_ATTRS + (
                 "spacer",
@@ -27,6 +31,6 @@ def formatTime(self, record, datefmt=None):
         if datefmt:
             s = time.strftime(datefmt, ct)
         else:
-            t = time.strftime("%Y-%m-%d %H:%M:%S", ct)
-            s = "%s,%06d" % (t, (record.created - int(record.created)) * 1e6)
+            t = time.strftime("%Y-%m-%dT%H:%M:%S", ct)
+            s = "%s,%06dZ" % (t, (record.created - int(record.created)) * 1e6)
         return s

src/DIRAC/FrameworkSystem/private/standardLogging/LogLevels.py

@@ -1,6 +1,7 @@
 """
 LogLevels wrapper
 """
+from __future__ import annotations
 from enum import IntEnum
 import logging
 
@@ -53,7 +54,7 @@ class LogLevels:
     }
 
     @classmethod
-    def getLevelValue(cls, sName):
+    def getLevelValue(cls, sName: str) -> int | None:
         """
         Get a level value from a level name.
         We could use logging.getLevelName() to get the level value but it is less simple.
@@ -64,7 +65,7 @@ def getLevelValue(cls, sName):
         return cls.__levelDict.get(sName.upper())
 
     @classmethod
-    def getLevel(cls, level):
+    def getLevel(cls, level: int) -> str | None:
         """
         Get a level name from a level value.
         We could use logging.getLevelName() to get the level value but it is less simple.
@@ -78,14 +79,14 @@ def getLevel(cls, level):
         return None
 
     @classmethod
-    def getLevelNames(cls):
+    def getLevelNames(cls) -> list[str]:
         """
         :return: all level names available in the wrapper
         """
         return list(cls.__levelDict)
 
     @classmethod
-    def getLevels(cls):
+    def getLevels(cls) -> dict[str, int]:
         """
         :return: the level dictionary. Must no be redefined
         """