diff options
| author | Erik Johnston <erik@matrix.org> | 2019-08-22 13:41:57 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-08-22 13:41:57 +0100 |
| commit | 1e4b4d85e7f4604d0617bba01b279f3dc2ced1d2 (patch) | |
| tree | 99baa32e4bc755be4c21f5d711b07a86bfff8020 /synapse/app/homeserver.py | |
| parent | Make changelog entry be a feature (diff) | |
| parent | Merge pull request #5850 from matrix-org/erikj/retry_well_known_on_fail (diff) | |
| download | synapse-1e4b4d85e7f4604d0617bba01b279f3dc2ced1d2.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reliable_lookups
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 |