summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-24 11:34:45 +0100
committerGitHub <noreply@github.com>2019-06-24 11:34:45 +0100
commitc3c6b00d956937ad50673cec75eab7989938a39b (patch)
treebb60d510a3c0c95c678179559914c6f7c60c3821 /synapse/config/server.py
parentFactor acme bits out to a separate file (#5521) (diff)
downloadsynapse-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/server.py')
-rw-r--r--synapse/config/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 9ceca0a606..1e58b2e91b 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -40,7 +40,7 @@ DEFAULT_ROOM_VERSION = "4"
 
 
 class ServerConfig(Config):
-    def read_config(self, config):
+    def read_config(self, config, **kwargs):
         self.server_name = config["server_name"]
         self.server_context = config.get("server_context", None)