diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-24 17:24:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 17:24:35 +0100 |
| commit | af8a9629057942d4dfa919df90d76d1fdc549606 (patch) | |
| tree | f404909096abfe3635a02568f5ff02d79e7126f6 /synapse/config/logger.py | |
| parent | Merge pull request #5499 from matrix-org/rav/cleanup_metrics (diff) | |
| parent | changelog (diff) | |
| download | synapse-af8a9629057942d4dfa919df90d76d1fdc549606.tar.xz | |
Merge pull request #5523 from matrix-org/rav/arg_defaults
Stop conflating generated config and default config
Diffstat (limited to 'synapse/config/logger.py')
| -rw-r--r-- | synapse/config/logger.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py index 153a137517..931aec41c0 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -80,7 +80,7 @@ class LoggingConfig(Config): self.log_config = self.abspath(config.get("log_config")) self.log_file = self.abspath(config.get("log_file")) - def default_config(self, config_dir_path, server_name, **kwargs): + def generate_config_section(self, config_dir_path, server_name, **kwargs): log_config = os.path.join(config_dir_path, server_name + ".log.config") return ( """\ @@ -133,7 +133,7 @@ class LoggingConfig(Config): help="Do not redirect stdout/stderr to the log", ) - def generate_files(self, config): + def generate_files(self, config, config_dir_path): log_config = config.get("log_config") if log_config and not os.path.exists(log_config): log_file = self.abspath("homeserver.log") |