Merge pull request #69081 from TeddyAndrieux/bugfix/none-opts-when-set-logging

fix(logging): tolerate unset options dict in worker bootstrap

Author: dwoz

changelog/68332.fixed.md

@@ -0,0 +1 @@
+Fixed worker process crash when salt is used outside CLI tools.

salt/_logging/impl.py

@@ -434,6 +434,8 @@ def set_logging_options_dict(opts):
     """
     Create a logging related options dictionary based off of the loaded salt config
     """
+    if opts is None:
+        return
     try:
         if isinstance(set_logging_options_dict.__options_dict__, ImmutableDict):
             raise RuntimeError(
@@ -969,7 +971,7 @@ def setup_log_granular_levels(log_granular_levels):
 def setup_logging():
     opts = get_logging_options_dict()
     if not opts:
-        raise RuntimeError("The logging options have not been set yet.")
+        return
     if (
         opts.get("configure_console_logger", True)
         and not is_console_handler_configured()

tests/pytests/functional/utils/test_process.py

@@ -125,3 +125,18 @@ def test_process_preimports_multiprocessing_connection_68573(tmp_path):
         cwd=str(tmp_path),
     )
     assert result.returncode == 0, f"stdout={result.stdout!r} stderr={result.stderr!r}"
+
+
+def test_process_unseeded_logging_options():
+    """
+    Regression test for issue #68332.
+    """
+
+    def target():
+        pass
+
+    salt._logging.set_logging_options_dict.__options_dict__ = None
+    proc = salt.utils.process.Process(target=target)
+    proc.start()
+    proc.join()
+    assert proc.exitcode == 0

tests/pytests/unit/_logging/test_impl.py

@@ -13,7 +13,10 @@
     SaltLogRecord,
     get_log_record_factory,
     set_log_record_factory,
+    set_logging_options_dict,
+    setup_logging,
 )
+from tests.support.mock import patch
 
 
 @pytest.fixture
@@ -119,3 +122,18 @@ def test_deferred_records_flushed_through_color_formatter(
     output = console_stream.getvalue()
     assert "buffered message" in output
     assert "DEBUG" in output
+
+
+def test_set_logging_options_dict_with_none():
+    """
+    Regression test for issue #68332.
+    """
+    set_logging_options_dict(None)
+
+
+def test_setup_logging_with_unseeded_options():
+    """
+    Regression test for issue #68332.
+    """
+    with patch.object(set_logging_options_dict, "__options_dict__", None, create=True):
+        setup_logging()