merge conflict

PrefectHQ · Feb 20, 2025 · 35500de · 35500de
1 parent 0888f84
commit 35500de
Show file tree

Hide file tree

Showing 2 changed files with 289 additions and 110 deletions.
diff --git a/src/prefect/logging/configuration.py b/src/prefect/logging/configuration.py
@@ -36,10 +36,17 @@ def load_logging_config(path: Path) -> dict[str, Any]:
 
     with warnings.catch_warnings():
         warnings.filterwarnings("ignore", category=DeprecationWarning)
-        config = yaml.safe_load(
-            # Substitute settings into the template in format $SETTING / ${SETTING}
-            template.substitute(current_settings.to_environment_variables())
-        )
+        env = current_settings.to_environment_variables()
+        while True:
+            try:
+                config = yaml.safe_load(
+                    # Substitute settings into the template in format $SETTING / ${SETTING}
+                    template.substitute(env)
+                )
+                break
+            except KeyError as e:
+                old_key = str(e).replace("'", "")
+                env.update({old_key: getattr(current_settings, old_key)})
 
     # Load overrides from the environment
     flat_config = dict_to_flatdict(config)