diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-08-17 10:50:42 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-08-17 10:50:42 +0100 |
| commit | bdd201ea7f7c53bce9788bb8d5cd9a0545a76285 (patch) | |
| tree | 58004f776dee6e070ca83727193bca40780baf80 /synapse/app/homeserver.py | |
| parent | Merge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_index (diff) | |
| parent | 1.3.1 (diff) | |
| download | synapse-bdd201ea7f7c53bce9788bb8d5cd9a0545a76285.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/app/homeserver.py')
| -rw-r--r-- | synapse/app/homeserver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 7d6b51b5bc..8233905844 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -447,7 +447,7 @@ def setup(config_options): reactor.stop() sys.exit(1) - reactor.addSystemEventTrigger("before", "startup", start) + reactor.callWhenRunning(start) return hs |