summary refs log tree commit diff
path: root/synapse/logging/handlers.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-08-05 11:15:29 +0100
committerErik Johnston <erik@matrix.org>2021-08-05 11:15:29 +0100
commita36d77c5630d238953bd97a068f891a444592cec (patch)
tree134dce205eded456158fe566653623609d14224a /synapse/logging/handlers.py
parentSend unstable-prefixed room_type in store-invite IS API requests (#10435) (diff)
parentFixup changelog (diff)
downloadsynapse-a36d77c5630d238953bd97a068f891a444592cec.tar.xz
Merge tag 'v1.40.0rc2' into develop
Synapse 1.40.0rc2 (2021-08-04)
==============================

Bugfixes
--------

- Fix the `PeriodicallyFlushingMemoryHandler` inhibiting application shutdown because of its background thread. ([\#10517](https://github.com/matrix-org/synapse/issues/10517))
- Fix a bug introduced in Synapse v1.40.0rc1 that could cause Synapse to respond with an error when clients would update read receipts. ([\#10531](https://github.com/matrix-org/synapse/issues/10531))

Internal Changes
----------------

- Fix release script to open the correct URL for the release. ([\#10516](https://github.com/matrix-org/synapse/issues/10516))
Diffstat (limited to 'synapse/logging/handlers.py')
-rw-r--r--synapse/logging/handlers.py1
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()