summary refs log tree commit diff
path: root/res/templates
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-09 18:50:38 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-09 18:50:38 +0100
commit7dbb473339bc41daf6c05b64756f97e011f653f5 (patch)
treebb52f284e6a96c2366a16e1af32d01390b48701b /res/templates
parentMerge pull request #862 from matrix-org/erikj/media_remote_error (diff)
downloadsynapse-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 'res/templates')
0 files changed, 0 insertions, 0 deletions