Merge c3d11b564b into be65a8ec01

.gitignore

@@ -25,6 +25,7 @@ __pycache__/
 /*.log
 /*.log.*
 /*.log.config
+/log.config
 /*.pid
 /.python-version
 /*.signing.key

debian/build_virtualenv

@@ -100,9 +100,6 @@ esac
 # tweak the pid file location
 /^pid_file:/ and s#:.*#: "/var/run/matrix-synapse.pid"#;
 
-# tweak the path to the log config
-/^log_config:/ and s/SERVERNAME\.log\.config/log.yaml/;
-
 # tweak the path to the media store
 /^media_store_path:/ and s#/media_store#/media#;
 
@@ -116,7 +113,7 @@ esac
 
 # build the log config file
 "${TARGET_PYTHON}" "${VIRTUALENV_DIR}/bin/generate_log_config" \
-        --output-file="${PACKAGE_BUILD_DIR}/etc/matrix-synapse/log.yaml"
+        --output-file="${PACKAGE_BUILD_DIR}/etc/matrix-synapse/log.config"
 
 # add a dependency on the right version of python to substvars.
 PYPKG=$(basename "$SNAKE")

synapse/config/logger.py

@@ -146,10 +146,8 @@ class LoggingConfig(Config):
         self.log_config = self.abspath(config.get("log_config"))
         self.no_redirect_stdio = config.get("no_redirect_stdio", False)
 
-    def generate_config_section(
-        self, config_dir_path: str, server_name: str, **kwargs: Any
-    ) -> str:
-        log_config = os.path.join(config_dir_path, server_name + ".log.config")
+    def generate_config_section(self, config_dir_path: str, **kwargs: Any) -> str:
+        log_config = os.path.join(config_dir_path, "log.config")
         return (
             """\
         log_config: "%(log_config)s"