Merge remote-tracking branch 'origin/develop' into azren/compressor_integration

1 files changed, 3 insertions, 1 deletions

diff --git a/synapse/config/logger.py b/synapse/config/logger.py

index aca9d467e6..0a08231e5a 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -322,7 +322,9 @@ def setup_logging(
 
     """
     log_config_path = (
-        config.worker_log_config if use_worker_options else config.log_config
+        config.worker.worker_log_config
+        if use_worker_options
+        else config.logging.log_config
     )
 
     # Perform one-time logging configuration.