tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix sdnotify with acme enabled (#6571)

Browse source 
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.
This commit is contained in:
Richard van der Hoff 2019-12-19 14:52:52 +00:00 committed by GitHub
parent b95b762560
commit 0b794cbd7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/6571.bugfix Normal file
View file

@ -0,0 +1 @@
Fix a bug which meant that we did not send systemd notifications on startup if acme was enabled.

10
synapse/app/_base.py
View file

@ -237,6 +237,12 @@ def start(hs, listeners=None):
""" """
Start a Synapse server or worker. 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: Args:
hs (synapse.server.HomeServer) hs (synapse.server.HomeServer)
listeners (list[dict]): Listener configuration ('listeners' in homeserver.yaml) 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 # Tell systemd our state, if we're using it. This will silently fail if
# we're not using systemd. # we're not using systemd.
hs.get_reactor().addSystemEventTrigger( sdnotify(b"READY=1\nMAINPID=%i" % (os.getpid(),))
"after", "startup", sdnotify, b"READY=1\nMAINPID=%i" % (os.getpid(),)
)
hs.get_reactor().addSystemEventTrigger( hs.get_reactor().addSystemEventTrigger(
"before", "shutdown", sdnotify, b"STOPPING=1" "before", "shutdown", sdnotify, b"STOPPING=1"