Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Drop dependency on sdnotify (#5871)
Browse files Browse the repository at this point in the history
... to save OSes which don't use it from having to maintain a port.

Fixes #5865.
  • Loading branch information
richvdh authored Aug 17, 2019
1 parent c188bd2 commit 412c6e2
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 11 deletions.
1 change: 1 addition & 0 deletions changelog.d/5871.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Drop hard dependency on `sdnotify` python package.
47 changes: 37 additions & 10 deletions synapse/app/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
import logging
import os
import signal
import socket
import sys
import traceback

import sdnotify
from daemonize import Daemonize

from twisted.internet import defer, error, reactor
Expand Down Expand Up @@ -246,13 +246,12 @@ def start(hs, listeners=None):
def handle_sighup(*args, **kwargs):
# Tell systemd our state, if we're using it. This will silently fail if
# we're not using systemd.
sd_channel = sdnotify.SystemdNotifier()
sd_channel.notify("RELOADING=1")
sdnotify(b"RELOADING=1")

for i in _sighup_callbacks:
i(hs)

sd_channel.notify("READY=1")
sdnotify(b"READY=1")

signal.signal(signal.SIGHUP, handle_sighup)

Expand Down Expand Up @@ -308,16 +307,12 @@ def setup_sdnotify(hs):

# Tell systemd our state, if we're using it. This will silently fail if
# we're not using systemd.
sd_channel = sdnotify.SystemdNotifier()

hs.get_reactor().addSystemEventTrigger(
"after",
"startup",
lambda: sd_channel.notify("READY=1\nMAINPID=%s" % (os.getpid())),
"after", "startup", sdnotify, b"READY=1\nMAINPID=%i" % (os.getpid(),)
)

hs.get_reactor().addSystemEventTrigger(
"before", "shutdown", lambda: sd_channel.notify("STOPPING=1")
"before", "shutdown", sdnotify, b"STOPPING=1"
)


Expand Down Expand Up @@ -414,3 +409,35 @@ def addressResolved(self, address):
def resolutionComplete(self):
self._deferred.callback(())
self._receiver.resolutionComplete()


sdnotify_sockaddr = os.getenv("NOTIFY_SOCKET")


def sdnotify(state):
"""
Send a notification to systemd, if the NOTIFY_SOCKET env var is set.
This function is based on the sdnotify python package, but since it's only a few
lines of code, it's easier to duplicate it here than to add a dependency on a
package which many OSes don't include as a matter of principle.
Args:
state (bytes): notification to send
"""
if not isinstance(state, bytes):
raise TypeError("sdnotify should be called with a bytes")
if not sdnotify_sockaddr:
return
addr = sdnotify_sockaddr
if addr[0] == "@":
addr = "\0" + addr[1:]

try:
with socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) as sock:
sock.connect(addr)
sock.sendall(state)
except Exception as e:
# this is a bit surprising, since we don't expect to have a NOTIFY_SOCKET
# unless systemd is expecting us to notify it.
logger.warning("Unable to send notification to systemd: %s", e)
1 change: 0 additions & 1 deletion synapse/python_dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
"netaddr>=0.7.18",
"Jinja2>=2.9",
"bleach>=1.4.3",
"sdnotify>=0.3",
]

CONDITIONAL_REQUIREMENTS = {
Expand Down

0 comments on commit 412c6e2

Please sign in to comment.