summary refs log tree commit diff
path: root/synapse/app/_base.py
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-12-15 08:23:14 -0500
committerPatrick Cloke <patrickc@matrix.org>2020-12-15 08:23:14 -0500
commit33a349df91a459435e33c5676bb40c8690492f65 (patch)
tree475c01ad2e72c69665974a8d4917e4095c3f280c /synapse/app/_base.py
parentMerge branch 'release-v1.24.0' of github.com:matrix-org/synapse into matrix-o... (diff)
parentFix startup failure with localdb_enabled: False (#8937) (diff)
downloadsynapse-33a349df91a459435e33c5676bb40c8690492f65.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/app/_base.py')
-rw-r--r--synapse/app/_base.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py

index 895b38ae76..37ecdbe3d8 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py
@@ -245,6 +245,8 @@ def start(hs: "synapse.server.HomeServer", listeners: Iterable[ListenerConfig]): # Set up the SIGHUP machinery. if hasattr(signal, "SIGHUP"): + reactor = hs.get_reactor() + @wrap_as_background_process("sighup") def handle_sighup(*args, **kwargs): # Tell systemd our state, if we're using it. This will silently fail if @@ -260,7 +262,9 @@ def start(hs: "synapse.server.HomeServer", listeners: Iterable[ListenerConfig]): # is so that we're in a sane state, e.g. flushing the logs may fail # if the sighup happens in the middle of writing a log entry. def run_sighup(*args, **kwargs): - hs.get_clock().call_later(0, handle_sighup, *args, **kwargs) + # `callFromThread` should be "signal safe" as well as thread + # safe. + reactor.callFromThread(handle_sighup, *args, **kwargs) signal.signal(signal.SIGHUP, run_sighup)