summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-30 13:48:15 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-30 13:48:15 +0100
commit1aa11cf7cef83f529bb6f48a76f2d2fe10a7cfe4 (patch)
tree92884d6eda9353d07cabf7b3e848de26e94a370d /synapse/config/homeserver.py
parentremove duplicate parse_size method (diff)
downloadsynapse-1aa11cf7cef83f529bb6f48a76f2d2fe10a7cfe4.tar.xz
Allow multiple config files, set up a default config before applying the config files
Diffstat (limited to '')
-rw-r--r--synapse/config/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index f9b4807a35..fe0ccb6eb7 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -37,5 +37,5 @@ class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
 if __name__ == '__main__':
     import sys
     sys.stdout.write(
-        HomeServerConfig().generate_config(sys.argv[1], sys.argv[2])
+        HomeServerConfig().generate_config(sys.argv[1], sys.argv[2])[0]
     )