From 67109b7008b18f59284ece416b682d616f7c2b59 Mon Sep 17 00:00:00 2001
From: Sean Bryan <sean.bryan@anu.edu.au>
Date: Thu, 9 May 2024 09:39:37 +1000
Subject: [PATCH] Add is_verbose() function

---
 src/benchcab/benchcab.py         | 3 ++-
 src/benchcab/utils/__init__.py   | 5 +++++
 src/benchcab/utils/subprocess.py | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/benchcab/benchcab.py b/src/benchcab/benchcab.py
index 92cafd0..ac6ef08 100644
--- a/src/benchcab/benchcab.py
+++ b/src/benchcab/benchcab.py
@@ -17,6 +17,7 @@
 from benchcab.environment_modules import EnvironmentModules, EnvironmentModulesInterface
 from benchcab.internal import get_met_forcing_file_names
 from benchcab.model import Model
+from benchcab.utils import is_verbose
 from benchcab.utils.fs import mkdir, next_path
 from benchcab.utils.pbs import render_job_script
 from benchcab.utils.repo import create_repo
@@ -202,7 +203,7 @@ def fluxsite_submit_job(self, config_path: str, skip: list[str]) -> None:
                 modules=config["modules"],
                 pbs_config=config["fluxsite"]["pbs"],
                 skip_bitwise_cmp="fluxsite-bitwise-cmp" in skip,
-                verbose=logger.getEffectiveLevel() == logging.DEBUG,
+                verbose=is_verbose(),
                 benchcab_path=str(self.benchcab_exe_path),
             )
             file.write(contents)
diff --git a/src/benchcab/utils/__init__.py b/src/benchcab/utils/__init__.py
index 5d67dc7..db8c427 100644
--- a/src/benchcab/utils/__init__.py
+++ b/src/benchcab/utils/__init__.py
@@ -143,3 +143,8 @@ def get_logger(name="benchcab", level="debug"):
     logger.addHandler(handler)
 
     return logger
+
+
+def is_verbose():
+    """Return True if verbose output is enabled, False otherwise."""
+    return get_logger().getEffectiveLevel() == logging.DEBUG
diff --git a/src/benchcab/utils/subprocess.py b/src/benchcab/utils/subprocess.py
index 8951c19..d728cbd 100644
--- a/src/benchcab/utils/subprocess.py
+++ b/src/benchcab/utils/subprocess.py
@@ -10,7 +10,7 @@
 from abc import abstractmethod
 from typing import Any, Optional
 
-from benchcab.utils import get_logger
+from benchcab.utils import is_verbose
 
 DEBUG_LEVEL = 10
 
@@ -63,7 +63,7 @@ def run_cmd(
 
         """
         # Use the logging level (10 = Debug) to determine verbosity.
-        verbose = get_logger().getEffectiveLevel() == DEBUG_LEVEL
+        verbose = is_verbose()
         kwargs: Any = {}
         with contextlib.ExitStack() as stack:
             if capture_output: