summary refs log tree commit diff
path: root/synapse/app/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-10-27 14:45:40 +0100
committerErik Johnston <erik@matrix.org>2021-10-27 14:45:40 +0100
commit179dc8ae9e15c38e282a2077fc5941b685fc6177 (patch)
treef5ad574dc229cd1d77e4ac06e221e13305a92004 /synapse/app/_base.py
parentImplement an `on_new_event` callback (#11126) (diff)
parentUpdate release date (diff)
downloadsynapse-179dc8ae9e15c38e282a2077fc5941b685fc6177.tar.xz
Merge remote-tracking branch 'origin/release-v1.46' into develop
Diffstat (limited to 'synapse/app/_base.py')
-rw-r--r--synapse/app/_base.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py
index 03627cdcba..f4c3f867a8 100644
--- a/synapse/app/_base.py
+++ b/synapse/app/_base.py
@@ -346,6 +346,7 @@ async def start(hs: "HomeServer"):
     # numbers of DNS requests don't starve out other users of the threadpool.
     resolver_threadpool = ThreadPool(name="gai_resolver")
     resolver_threadpool.start()
+    reactor.addSystemEventTrigger("during", "shutdown", resolver_threadpool.stop)
     reactor.installNameResolver(
         GAIResolver(reactor, getThreadPool=lambda: resolver_threadpool)
     )