Merge branch 'master' into fix/encoding_fallback

Author: Hmnt39

cognite/extractorutils/unstable/core/base.py

@@ -220,14 +220,13 @@ def _setup_logging(self) -> None:
                 case LogConsoleHandlerConfig() as console_handler:
                     sh = logging.StreamHandler()
                     sh.setFormatter(fmt)
-                    level_for_handler = _resolve_log_level(
-                        self.log_level_override if self.log_level_override else console_handler.level.value
-                    )
+                    level_for_handler = _resolve_log_level(self.log_level_override or console_handler.level.value)
                     sh.setLevel(level_for_handler)
 
                     root.addHandler(sh)
 
                 case LogFileHandlerConfig() as file_handler:
+                    level_for_handler = _resolve_log_level(self.log_level_override or file_handler.level.value)
                     try:
                         fh = RobustFileHandler(
                             filename=file_handler.path,
@@ -236,23 +235,20 @@ def _setup_logging(self) -> None:
                             backupCount=file_handler.retention,
                             create_dirs=True,
                         )
-                        level_for_handler = _resolve_log_level(
-                            self.log_level_override if self.log_level_override else file_handler.level.value
-                        )
                         fh.setLevel(level_for_handler)
                         fh.setFormatter(fmt)
 
                         root.addHandler(fh)
                     except (OSError, PermissionError) as e:
-                        self._logger.warning(
-                            f"Could not create or write to log file {file_handler.path}: {e}. "
-                            "Falling back to console logging."
-                        )
                         if not any(isinstance(h, logging.StreamHandler) for h in root.handlers):
                             sh = logging.StreamHandler()
                             sh.setFormatter(fmt)
                             sh.setLevel(level_for_handler)
                             root.addHandler(sh)
+                        self._logger.warning(
+                            f"Could not create or write to log file {file_handler.path}: {e}. "
+                            "Defaulted to console logging."
+                        )
 
     def _load_state_store(self) -> None:
         """

cognite/extractorutils/unstable/core/runtime.py

@@ -180,8 +180,8 @@ def _create_argparser(self) -> ArgumentParser:
             choices=["debug", "info", "warning", "error", "critical"],
             type=str,
             required=False,
-            default="info",
-            help="Set the logging level for the runtime. Default is 'info'.",
+            default=None,
+            help="Set the logging level for the runtime.",
         )
         argparser.add_argument(
             "--skip-init-checks",

tests/test_unstable/test_base.py

@@ -14,6 +14,8 @@
     ConnectionConfig,
     LocalStateStoreConfig,
     LogConsoleHandlerConfig,
+    LogFileHandlerConfig,
+    LogHandlerConfig,
     LogLevel,
     RawStateStoreConfig,
     StateStoreConfig,
@@ -36,32 +38,38 @@ def get_checkin_worker(connection_config: ConnectionConfig) -> CheckinWorker:
 
 
 @pytest.mark.parametrize(
-    "config_level, override_level, expected_logs, unexpected_logs",
+    "log_handlers, override_level, expected_logs, unexpected_logs",
     [
         (
-            "INFO",
+            [LogConsoleHandlerConfig(type="console", level=LogLevel("INFO"))],
             None,
             ["This is an info message.", "This is a warning message."],
             ["This is a debug message."],
         ),
         (
-            "INFO",
+            [LogConsoleHandlerConfig(type="console", level=LogLevel("INFO"))],
             "DEBUG",
             ["This is a debug message.", "This is an info message.", "This is a warning message."],
             [],
         ),
         (
-            "INFO",
+            [LogConsoleHandlerConfig(type="console", level=LogLevel("INFO"))],
             "WARNING",
             ["This is a warning message."],
             ["This is a debug message.", "This is an info message."],
         ),
+        (
+            [LogFileHandlerConfig(type="file", level=LogLevel("INFO"), path=Path("non-existing/test.log"))],
+            "WARNING",
+            ["This is a warning message."],
+            ["Falling back to console logging.", "This is a debug message.", "This is an info message."],
+        ),
     ],
 )
 def test_log_level_override(
     capsys: pytest.CaptureFixture[str],
     connection_config: ConnectionConfig,
-    config_level: str,
+    log_handlers: list[LogHandlerConfig],
     override_level: str | None,
     expected_logs: list[str],
     unexpected_logs: list[str],
@@ -73,7 +81,7 @@ def test_log_level_override(
     app_config = TestConfig(
         parameter_one=1,
         parameter_two="a",
-        log_handlers=[LogConsoleHandlerConfig(type="console", level=LogLevel(config_level))],
+        log_handlers=log_handlers,
     )
 
     full_config = FullConfig(
@@ -163,7 +171,7 @@ def test_local_state_store_integration(local_state_file: Path, connection_config
 
 
 @pytest.fixture(scope="function")
-def raw_db_table_name() -> str:
+def raw_db_table_name() -> tuple[str, str]:
     """Provides a unique database name for a single test function run."""
     test_id = random.randint(0, int(1e9))
     return f"test_db_{test_id}", f"test_table_{test_id}"