diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-06-10 11:12:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-10 11:12:32 +0100 |
| commit | 41b35412bfb52c2fdfd1c25f9244472de5829d3d (patch) | |
| tree | 67e31c7b4be6a9cd56082ff4fdb4b0c07c55910a /synapse/app | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Add function to load config without generating it (diff) | |
| download | synapse-41b35412bfb52c2fdfd1c25f9244472de5829d3d.tar.xz | |
Merge pull request #863 from matrix-org/markjh/load_config
Add function to load config without generating it
Diffstat (limited to 'synapse/app')
| -rwxr-xr-x | synapse/app/homeserver.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 22e1721fc4..40ffd9bf0d 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -266,10 +266,9 @@ def setup(config_options): HomeServer """ try: - config = HomeServerConfig.load_config( + config = HomeServerConfig.load_or_generate_config( "Synapse Homeserver", config_options, - generate_section="Homeserver" ) except ConfigError as e: sys.stderr.write("\n" + e.message + "\n") |