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 /tests/config/test_generate.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 'tests/config/test_generate.py')
| -rw-r--r-- | tests/config/test_generate.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/config/test_generate.py b/tests/config/test_generate.py index 4329d73974..8f57fbeb23 100644 --- a/tests/config/test_generate.py +++ b/tests/config/test_generate.py @@ -30,7 +30,7 @@ class ConfigGenerationTestCase(unittest.TestCase): shutil.rmtree(self.dir) def test_generate_config_generates_files(self): - HomeServerConfig.load_config("", [ + HomeServerConfig.load_or_generate_config("", [ "--generate-config", "-c", self.file, "--report-stats=yes", |