diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-12-19 14:52:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 14:52:52 +0000 |
| commit | 0b794cbd7b232b42a2d726e6ab6c698d4bf35093 (patch) | |
| tree | cf717a99e681426e39274c5b5ac0c3612ff90906 /synapse | |
| parent | Add an export_signing_key script (#6546) (diff) | |
| download | synapse-0b794cbd7b232b42a2d726e6ab6c698d4bf35093.tar.xz | |
Fix sdnotify with acme enabled (#6571)
If acme was enabled, the sdnotify startup hook would never be run because we would try to add it to a hook which had already fired. There's no need to delay it: we can sdnotify as soon as we've started the listeners.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/app/_base.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py index 9c96816096..0e8b467a3e 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -237,6 +237,12 @@ def start(hs, listeners=None): """ Start a Synapse server or worker. + Should be called once the reactor is running and (if we're using ACME) the + TLS certificates are in place. + + Will start the main HTTP listeners and do some other startup tasks, and then + notify systemd. + Args: hs (synapse.server.HomeServer) listeners (list[dict]): Listener configuration ('listeners' in homeserver.yaml) @@ -311,9 +317,7 @@ def setup_sdnotify(hs): # Tell systemd our state, if we're using it. This will silently fail if # we're not using systemd. - hs.get_reactor().addSystemEventTrigger( - "after", "startup", sdnotify, b"READY=1\nMAINPID=%i" % (os.getpid(),) - ) + sdnotify(b"READY=1\nMAINPID=%i" % (os.getpid(),)) hs.get_reactor().addSystemEventTrigger( "before", "shutdown", sdnotify, b"STOPPING=1" |