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/homeserver.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/homeserver.py')
-rw-r--r--[-rwxr-xr-x] | synapse/app/homeserver.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 0c075cb3f1..7d6b51b5bc 100755..100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -406,7 +406,7 @@ def setup(config_options): if provision: yield acme.provision_certificate() - defer.returnValue(provision) + return provision @defer.inlineCallbacks def reprovision_acme(): @@ -447,7 +447,7 @@ def setup(config_options): reactor.stop() sys.exit(1) - reactor.callWhenRunning(start) + reactor.addSystemEventTrigger("before", "startup", start) return hs |