diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:52:57 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-30 16:52:57 +0100 |
| commit | 2f1348f3395ba44cece492205ce7fa87ac519bee (patch) | |
| tree | 57c2783ca4b2a39176385fd6720fe98fdbc17468 /synapse/config/_base.py | |
| parent | Don't break when sizes or durations are given as integers (diff) | |
| download | synapse-2f1348f3395ba44cece492205ce7fa87ac519bee.tar.xz | |
Write a default log_config when generating config
Diffstat (limited to 'synapse/config/_base.py')
| -rw-r--r-- | synapse/config/_base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index e0c203cb1f..d7ccfcd98c 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -171,7 +171,7 @@ class Config(object): config_bytes, config = obj.generate_config( config_dir_path, server_name ) - obj.invoke_all("generate_keys", config) + obj.invoke_all("generate_files", config) config_file.write(config_bytes) print ( "A config file has been generated in %s for server name" @@ -192,6 +192,7 @@ class Config(object): server_name = specified_config["server_name"] _, config = obj.generate_config(config_dir_path, server_name) + config.pop("log_config") config.update(specified_config) obj.invoke_all("read_config", config) |