diff options
author | Erik Johnston <erik@matrix.org> | 2021-10-27 14:45:40 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-10-27 14:45:40 +0100 |
commit | 179dc8ae9e15c38e282a2077fc5941b685fc6177 (patch) | |
tree | f5ad574dc229cd1d77e4ac06e221e13305a92004 /synapse/app/_base.py | |
parent | Implement an `on_new_event` callback (#11126) (diff) | |
parent | Update release date (diff) | |
download | synapse-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.py | 1 |
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) ) |