Merge remote-tracking branch 'upstream/release-v1.40'

This commit is contained in:
Tulir Asokan 2021-08-04 19:30:31 +03:00
commit 4aa8d1b6dc
6 changed files with 37 additions and 2 deletions

View file

@ -47,7 +47,7 @@ try:
except ImportError:
pass
__version__ = "1.40.0rc1"
__version__ = "1.40.0rc2"
if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
# We import here so that we don't have to install a bunch of deps when

View file

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