Merge branch 'release-v1.40' of github.com:matrix-org/synapse into matrix-org-hotfixes

1 files changed, 1 insertions, 0 deletions

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()