diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-24 11:34:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 11:34:45 +0100 |
| commit | c3c6b00d956937ad50673cec75eab7989938a39b (patch) | |
| tree | bb60d510a3c0c95c678179559914c6f7c60c3821 /synapse/config/key.py | |
| parent | Factor acme bits out to a separate file (#5521) (diff) | |
| download | synapse-c3c6b00d956937ad50673cec75eab7989938a39b.tar.xz | |
Pass config_dir_path and data_dir_path into Config.read_config. (#5522)
* Pull config_dir_path and data_dir_path calculation out of read_config_files * Pass config_dir_path and data_dir_path into read_config
Diffstat (limited to 'synapse/config/key.py')
| -rw-r--r-- | synapse/config/key.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index 21c4f5c51c..e58638f708 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -65,7 +65,7 @@ class TrustedKeyServer(object): class KeyConfig(Config): - def read_config(self, config): + def read_config(self, config, **kwargs): # the signing key can be specified inline or in a separate file if "signing_key" in config: self.signing_key = read_signing_keys([config["signing_key"]]) |