make common log_setattr function

Signed-off-by: Zen <[email protected]>

Author: desultory

src/zenlib/logging/classlogger.py

@@ -1,7 +1,7 @@
 __author__ = "desultory"
 __version__ = "2.1.0"
 
-from .utils import add_handler_if_not_exists, log_init
+from .utils import add_handler_if_not_exists, log_init, log_setattr
 
 from logging import Logger, getLogger
 
@@ -21,22 +21,12 @@ def __init__(self, *args, **kwargs):
         # Log class init if _log_init is passed
         log_init(self, args, kwargs)
 
+        # add setattr logging
+        setattr(self, "__setattr__", log_setattr)
+
         if super().__class__.__class__ is not type:
             super().__init__(*args, **kwargs)
 
-    def __setattr__(self, name, value):
-        """ Add logging to setattr. """
-        super().__setattr__(name, value)
-
-        # Check if the logger is defined
-        if not hasattr(self, 'logger') or not isinstance(self.logger, Logger):
-            return
-
-        elif isinstance(value, list) or isinstance(value, dict) or isinstance(value, str) and "\n" in value:
-            self.logger.log(5, "Setattr '%s' to:\n%s" % (name, value))
-        else:
-            self.logger.log(5, "Setattr '%s' to: %s" % (name, value))
-
     def __setitem__(self, name, value):
         """ Add logging to dict setitem. """
         if hasattr(super(), '__setitem__'):

src/zenlib/logging/loggify.py

@@ -1,7 +1,7 @@
 __author__ = "desultory"
 __version__ = "2.4.0"
 
-from .utils import add_handler_if_not_exists, log_init
+from .utils import add_handler_if_not_exists, log_init, log_setattr
 
 from logging import Logger, getLogger
 
@@ -22,20 +22,10 @@ def __init__(self, *args, **kwargs):
             # Log class init if _log_init is passed
             log_init(self, args, kwargs, cls)
 
-            super().__init__(*args, **kwargs)
-
-        def __setattr__(self, name, value):
-            """ Add logging to setattr. """
-            super().__setattr__(name, value)
+            # Add setattr logging
+            setattr(self, "__setattr__", log_setattr)
 
-            # Check if the logger is defined
-            if not isinstance(self.logger, Logger):
-                raise ValueError("The logger is not defined")
-
-            if isinstance(value, list) or isinstance(value, dict) or isinstance(value, str) and "\n" in value:
-                self.logger.log(5, "Setattr '%s' to:\n%s" % (name, getattr(self, name)))
-            else:
-                self.logger.log(5, "Setattr '%s' to: %s" % (name, getattr(self, name)))
+            super().__init__(*args, **kwargs)
 
     ClassLogger.__name__ = cls.__name__
     ClassLogger.__module__ = cls.__module__

src/zenlib/logging/utils.py

@@ -1,3 +1,5 @@
+from logging import Logger
+
 def _logger_has_handler(logger):
     """ Checks if a logger or its parents has a handler already """
     while logger:
@@ -38,3 +40,16 @@ def log_init(self, args, kwargs, cls=None):
 
     if class_version := getattr(cls, '__version__', None):
         logger.info("[%s] Class version: %s" % (class_name, class_version))
+
+def log_setattr(self, name, value):
+    """ Logs when an attribute is set """
+    super().__setattr__(name, value)
+    # check if the logger is defined
+    if not isinstance(self.logger, Logger):
+        raise ValueError("Logger is not defined")
+
+    # Log containers or strings with newlines on a new line
+    if isinstance(value, list) or isinstance(value, dict) or isinstance(value, str) and "\n" in value:
+        self.logger.log(5, "Setattr '%s' to:\n%s" % (name, getattr(self, name)))
+    else:
+        self.logger.log(5, "Setattr '%s' to: %s" % (name, getattr(self, name)))