#144 Move logging settings to cli functions

deshima-dev · Jul 14, 2024 · b92c2ff · b92c2ff
1 parent b8159f1
commit b92c2ff
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 33 deletions.
diff --git a/demerge/__init__.py b/demerge/__init__.py
@@ -3,6 +3,7 @@
 
 
 # standard library
+from contextlib import contextmanager
 from logging import DEBUG, basicConfig, getLogger
 from pathlib import Path
 from typing import Any
@@ -19,6 +20,19 @@
 LOGGER = getLogger(__name__)
 
 
+@contextmanager
+def set_logger(debug: bool):
+    level = LOGGER.level
+
+    if debug:
+        LOGGER.setLevel(DEBUG)
+
+    try:
+        yield
+    finally:
+        LOGGER.setLevel(level)
+
+
 def demerge(
     obsid: str,
     /,
@@ -51,16 +65,9 @@ def demerge(
         Path of the merged DEMS file.
 
     """
-    if debug:
-        LOGGER.setLevel(DEBUG)
-
-    basicConfig(
-        datefmt="%Y-%m-%d %H:%M:%S",
-        format="[%(asctime)s %(name)s %(levelname)s] %(message)s",
-    )
-
-    for key, val in locals().items():
-        LOGGER.debug(f"{key}: {val!r}")
+    with set_logger(debug):
+        for key, val in locals().items():
+            LOGGER.debug(f"{key}: {val!r}")
 
     data_dir_ = Path(data_dir).resolve() / f"cosmos_{obsid}"
     reduced_dir_ = Path(reduced_dir).resolve() / f"reduced_{obsid}"
@@ -127,4 +134,9 @@ def demerge(
 
 def cli() -> None:
     """Command line interface of the demerge function."""
+    basicConfig(
+        datefmt="%Y-%m-%d %H:%M:%S",
+        format="[%(asctime)s %(name)s %(funcName)s %(levelname)s] %(message)s",
+    )
+
     Fire(demerge)
diff --git a/demerge/merge/__init__.py b/demerge/merge/__init__.py
@@ -2,6 +2,7 @@
 
 
 # standard library
+from contextlib import contextmanager
 from logging import DEBUG, basicConfig, getLogger
 from pathlib import Path
 
@@ -15,6 +16,19 @@
 LOGGER = getLogger(__name__)
 
 
+@contextmanager
+def set_logger(debug: bool):
+    level = LOGGER.level
+
+    if debug:
+        LOGGER.setLevel(DEBUG)
+
+    try:
+        yield
+    finally:
+        LOGGER.setLevel(level)
+
+
 def merge(
     dems: Path,
     /,
@@ -60,20 +74,10 @@ def merge(
         FileExistsError: Raised if ``dems`` exists.
 
     """
-    # ロガーの設定
-    if debug:
-        LOGGER.setLevel(DEBUG)
+    with set_logger(debug):
+        for key, val in locals().items():
+            LOGGER.debug(f"{key}: {val!r}")
 
-    basicConfig(
-        datefmt="%Y-%m-%d %H:%M:%S",
-        format="[%(asctime)s %(name)s %(levelname)s] %(message)s",
-    )
-
-    # 引数と値をロガーに記録
-    for key, val in locals().items():
-        LOGGER.debug(f"{key}: {val!r}")
-
-    # マージの実行
     da = create_dems(
         ddbfits_path=ddb,
         corresp_path=corresp,
@@ -102,4 +106,9 @@ def merge(
 
 def cli() -> None:
     """Command line interface of the merge function."""
+    basicConfig(
+        datefmt="%Y-%m-%d %H:%M:%S",
+        format="[%(asctime)s %(name)s %(funcName)s %(levelname)s] %(message)s",
+    )
+
     Fire(merge)
diff --git a/demerge/reduce/__init__.py b/demerge/reduce/__init__.py
@@ -2,6 +2,7 @@
 
 
 # standard library
+from contextlib import contextmanager
 from logging import DEBUG, basicConfig, getLogger
 from pathlib import Path
 from shutil import rmtree
@@ -18,6 +19,19 @@
 SCRIPTS = Path(__file__).parent / "utils" / "scripts" / "aste"
 
 
+@contextmanager
+def set_logger(debug: bool):
+    level = LOGGER.level
+
+    if debug:
+        LOGGER.setLevel(DEBUG)
+
+    try:
+        yield
+    finally:
+        LOGGER.setLevel(level)
+
+
 def reduce(
     data_dir: Path,
     reduced_dir: Path,
@@ -42,16 +56,9 @@ def reduce(
         FileExistsError: Raised if ``reduced_dir`` exists.
 
     """
-    if debug:
-        LOGGER.setLevel(DEBUG)
-
-    basicConfig(
-        datefmt="%Y-%m-%d %H:%M:%S",
-        format="[%(asctime)s %(name)s %(levelname)s] %(message)s",
-    )
-
-    for key, val in locals().items():
-        LOGGER.debug(f"{key}: {val!r}")
+    with set_logger(debug):
+        for key, val in locals().items():
+            LOGGER.debug(f"{key}: {val!r}")
 
     # Resolve paths (must be done before changing working directory)
     if not (data_dir := Path(data_dir).resolve()).exists():
@@ -92,4 +99,9 @@ def reduce(
 
 def cli() -> None:
     """Command line interface of the reduce function."""
+    basicConfig(
+        datefmt="%Y-%m-%d %H:%M:%S",
+        format="[%(asctime)s %(name)s %(funcName)s %(levelname)s] %(message)s",
+    )
+
     Fire(reduce)