diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-06-09 18:50:38 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-06-09 18:50:38 +0100 |
| commit | 7dbb473339bc41daf6c05b64756f97e011f653f5 (patch) | |
| tree | bb52f284e6a96c2366a16e1af32d01390b48701b /synapse/app/homeserver.py | |
| parent | Merge pull request #862 from matrix-org/erikj/media_remote_error (diff) | |
| download | synapse-7dbb473339bc41daf6c05b64756f97e011f653f5.tar.xz | |
Add function to load config without generating it
Renames ``load_config`` to ``load_or_generate_config`` Adds a method called ``load_config`` that just loads the config. The main synapse.app.homeserver will continue to use ``load_or_generate_config`` to retain backwards compat. However new worker processes can use ``load_config`` to load the config avoiding some of the cruft needed to generate the config. As the new ``load_config`` method is expected to be used by new configs it removes support for the legacy commandline overrides that ``load_or_generate_config`` supports
Diffstat (limited to 'synapse/app/homeserver.py')
| -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") |