summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorChris Moos <chris@chrismoos.com>2019-08-15 18:16:27 -0700
committerRichard van der Hoff <richard@matrix.org>2019-08-16 22:16:13 +0100
commit6d86df73f18803c148c320c3b3089cb0d7e2f30a (patch)
tree6038703a858b99f7ff25a4b82445feaa107d4cc0 /synapse
parentMerge tag 'v1.3.0' (diff)
downloadsynapse-6d86df73f18803c148c320c3b3089cb0d7e2f30a.tar.xz
Fix issue with Synapse not starting up. Fixes #5866.
Signed-off-by: Chris Moos <chris@chrismoos.com>
Diffstat (limited to 'synapse')
-rw-r--r--synapse/app/homeserver.py2
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