update hpc_connect logging

Author: tjfulle

src/_canary/util/logging.py

@@ -1,12 +1,6 @@
 # Copyright NTESS. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: MIT
-
-# /Formatter
-#  Copyright NTESS. See COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: MIT
-
 import datetime
 import json
 import logging as builtin_logging
@@ -172,7 +166,7 @@ def __init__(
         max_interval: float = 120.0,
         growth: float = 1.6,
     ) -> None:
-        self.logger = get_logger(name)
+        self.logger_name = name
         self.min_interval = min_interval
         self.max_interval = max_interval
         self.growth = growth
@@ -190,7 +184,7 @@ def emit(self, signature: tuple[str, ...], msg: str) -> None:
             self._last_emit = 0.0
 
         if now - self._last_emit >= self._interval:
-            self.logger.debug(msg)
+            get_logger(self.logger_name).debug(msg)
             self._last_emit = now
             self._interval = min(self._interval * self.growth, self.max_interval)
 
@@ -201,10 +195,13 @@ def emit(self, signature: tuple[str, ...], msg: str) -> None:
 def get_logger(name: str | None = None) -> CanaryLogger:
     if name is None:
         name = root_log_name
-    parts = name.split(".")
-    if parts[0] != root_log_name:
-        parts.insert(0, root_log_name)
-        name = ".".join(parts)
+    else:
+        parts = name.split(".")
+        if parts[0] == "_canary":
+            parts[0] = root_log_name
+        elif parts[0] != root_log_name:
+            parts.insert(0, root_log_name)
+            name = ".".join(parts)
     logger = cast(CanaryLogger, builtin_logging.getLogger(name))
     return logger
 
@@ -306,20 +303,20 @@ def get_level() -> int:
 
 
 def info(*args, **kwargs):
-    logger = get_logger()
-    logger.info(*args, **kwargs)
+    get_logger().info(*args, **kwargs)
 
 
 def warning(*args, **kwargs):
-    logger = get_logger()
-    logger.warning(*args, **kwargs)
+    get_logger().warning(*args, **kwargs)
 
 
 def error(*args, **kwargs):
-    logger = get_logger()
-    logger.error(*args, **kwargs)
+    get_logger().error(*args, **kwargs)
 
 
 def critical(*args, **kwargs):
-    logger = get_logger()
-    logger.critical(*args, **kwargs)
+    get_logger().critical(*args, **kwargs)
+
+
+def exception(*args, **kwargs):
+    get_logger().exception(*args, **kwargs)

src/canary_hpc/batchexec.py

@@ -27,18 +27,17 @@
 class HPCConnectRunner:
     def __init__(self, backend: hpc_connect.HPCSubmissionManager) -> None:
         self.backend = backend
-        self.alogger = canary.logging.AdaptiveDebugLogger(__name__)
+        self.alogger = canary.logging.AdaptiveDebugLogger(__name__, max_interval=300.0)
 
     def execute(self, batch: "TestBatch") -> int | None:
         logger.debug(f"Starting {batch} on pid {os.getpid()}")
 
         canary.Workspace.load()
 
         # Force hpc_connect logger to use the root logger setup by canary
-        hpc = hpc_connect.get_logger("hpc_connect")
+        hpc = logging.getLogger("hpc_connect")
         hpc.handlers.clear()
         hpc.propagate = True
-        hpc.setLevel(logging.DEBUG)
 
         with batch.workspace.enter():
             proc = self.submit(batch)
@@ -51,6 +50,8 @@ def execute(self, batch: "TestBatch") -> int | None:
                         self.alogger.emit(("",), f"{batch}.poll() = {rc}")
                         if rc is not None:
                             break
+                        if self.alogger._interval >= self.alogger.max_interval:
+                            self.alogger._interval = self.alogger.min_interval
                     except Exception:
                         logger.exception("Batch %s: polling job failed!" % batch.id[:7])
                         break