summary refs log tree commit diff
diff options
context:
space:
mode:
authorreivilibre <38398653+reivilibre@users.noreply.github.com>2021-08-03 14:28:30 +0100
committerGitHub <noreply@github.com>2021-08-03 14:28:30 +0100
commit903db99ed552d06f0a9e0379e55e655c5761355b (patch)
tree512878ae178551de646e72b36ae9f48ef3059e8e
parentFix release script URL (#10516) (diff)
downloadsynapse-903db99ed552d06f0a9e0379e55e655c5761355b.tar.xz
Fix PeriodicallyFlushingMemoryHandler inhibiting application shutdown (#10517)
Diffstat (limited to '')
-rw-r--r--changelog.d/10517.bugfix1
-rw-r--r--synapse/logging/handlers.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/10517.bugfix b/changelog.d/10517.bugfix
new file mode 100644
index 0000000000..5b044bb34d
--- /dev/null
+++ b/changelog.d/10517.bugfix
@@ -0,0 +1 @@
+Fix the `PeriodicallyFlushingMemoryHandler` inhibiting application shutdown because of its background thread.
diff --git a/synapse/logging/handlers.py b/synapse/logging/handlers.py
index a6c212f300..af5fc407a8 100644
--- a/synapse/logging/handlers.py
+++ b/synapse/logging/handlers.py
@@ -45,6 +45,7 @@ class PeriodicallyFlushingMemoryHandler(MemoryHandler):
         self._flushing_thread: Thread = Thread(
             name="PeriodicallyFlushingMemoryHandler flushing thread",
             target=self._flush_periodically,
+            daemon=True,
         )
         self._flushing_thread.start()