diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2018-01-09 12:08:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 12:08:08 +0000 |
| commit | cb66a2d387d071f4614f7c04295f02145bba5fd3 (patch) | |
| tree | 375d83cf01dd28547e600c21b6bd0c5c944ae7df /synapse | |
| parent | Merge pull request #2762 from matrix-org/rav/fix_logconfig_indenting (diff) | |
| parent | Fix broken config UTs (diff) | |
| download | synapse-cb66a2d387d071f4614f7c04295f02145bba5fd3.tar.xz | |
Merge pull request #2763 from matrix-org/rav/fix_config_uts
Fix broken config UTs
Diffstat (limited to 'synapse')
| -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 9ee46c4dea..3f70039acd 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -74,7 +74,6 @@ class LoggingConfig(Config): self.log_file = self.abspath(config.get("log_file")) def default_config(self, config_dir_path, server_name, **kwargs): - log_file = self.abspath("homeserver.log") log_config = self.abspath( os.path.join(config_dir_path, server_name + ".log.config") ) @@ -117,9 +116,10 @@ class LoggingConfig(Config): def generate_files(self, config): log_config = config.get("log_config") if log_config and not os.path.exists(log_config): + log_file = self.abspath("homeserver.log") with open(log_config, "wb") as log_config_file: log_config_file.write( - DEFAULT_LOG_CONFIG.substitute(log_file=config["log_file"]) + DEFAULT_LOG_CONFIG.substitute(log_file=log_file) ) |