diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-01 16:31:40 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-01 16:31:40 -0400 |
| commit | 336c546d6af5e85d830b6fe7cdc5445f92060b8a (patch) | |
| tree | 58a4794f7bcabf8c72013365d185f8099666d630 /synapse/app/user_dir.py | |
| parent | Merge branch 'cross-signing_hidden' into cross-signing_keys (diff) | |
| parent | don't need to return the hidden column any more (diff) | |
| download | synapse-336c546d6af5e85d830b6fe7cdc5445f92060b8a.tar.xz | |
Merge branch 'cross-signing_hidden' into cross-signing_keys
Diffstat (limited to 'synapse/app/user_dir.py')
| -rw-r--r-- | synapse/app/user_dir.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py index 03ef21bd01..cb29a1afab 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py @@ -224,7 +224,9 @@ def start(config_options): ) ss.setup() - reactor.callWhenRunning(_base.start, ss, config.worker_listeners) + reactor.addSystemEventTrigger( + "before", "startup", _base.start, ss, config.worker_listeners + ) _base.start_worker_reactor("synapse-user-dir", config) |