Cleanup

DKISTDC · Jan 23, 2024 · 11289a9 · 11289a9
1 parent c286dc8
commit 11289a9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/dkist/__init__.py b/dkist/__init__.py
@@ -4,7 +4,9 @@
 from importlib.metadata import PackageNotFoundError
 from importlib.metadata import version as _version
 
-from .logger import log
+from .logger import setup_default_dkist_logger as _setup_log
+
+log = _setup_log(__name__)
 
 try:
     __version__ = _version(__name__)

diff --git a/dkist/logger.py b/dkist/logger.py
@@ -72,7 +72,8 @@ def makeRecord(
         )
 
     def _showwarning(self, *args, **kwargs):
-        # Bail out if we are not catching a warning from Astropy
+        # Bail out if we are not catching a warning from one of the given
+        # classes (or subclasses)
         if not isinstance(args[0], self.capture_warning_classes):
             return self._showwarning_orig(*args, **kwargs)
 
@@ -102,5 +103,7 @@ def _showwarning(self, *args, **kwargs):
             self.warning(message)
 
 
-log = DKISTLogger(__name__, level=logging.INFO, capture_warning_classes=[DKISTWarning])
-log.addHandler(AstropyStreamHandler())
+def setup_default_dkist_logger(name):
+    log = DKISTLogger(name, level=logging.INFO, capture_warning_classes=[DKISTWarning])
+    log.addHandler(AstropyStreamHandler())
+    return log