diff options
| author | Erik Johnston <erikj@jki.re> | 2019-03-15 10:35:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 10:35:38 +0000 |
| commit | b0fa3f6ff3a84c66a2cd6b8e18413fe051ff257f (patch) | |
| tree | eda8410722f1f740778c723886d7abc33f8747d1 /synapse/config/_base.py | |
| parent | Add systemd setup that supports workers (#4662) (diff) | |
| parent | Correctly handle all command line options (diff) | |
| download | synapse-b0fa3f6ff3a84c66a2cd6b8e18413fe051ff257f.tar.xz | |
Merge pull request #4853 from matrix-org/erikj/worker_docker_ci
Allow passing --daemonize to workers
Diffstat (limited to 'synapse/config/_base.py')
| -rw-r--r-- | synapse/config/_base.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py index c4d3087fa4..5613f38e4d 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -214,14 +214,20 @@ class Config(object): " Defaults to the directory containing the last config file", ) + obj = cls() + + obj.invoke_all("add_arguments", config_parser) + config_args = config_parser.parse_args(argv) config_files = find_config_files(search_paths=config_args.config_path) - obj = cls() obj.read_config_files( config_files, keys_directory=config_args.keys_directory, generate_keys=False ) + + obj.invoke_all("read_arguments", config_args) + return obj @classmethod |