summary refs log tree commit diff
path: root/synapse/storage/database.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-12-31 11:24:03 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-12-31 11:24:03 +0000
commit4c7d889be7ef5c1d123a926fd9481574bd4a6b4d (patch)
treeb1871cc359d90b9049c4cc34d34f91e107214a75 /synapse/storage/database.py
parentMerge commit '3ee17585c' into dinsic (diff)
parentReplace DeferredCache with LruCache where possible (#8563) (diff)
downloadsynapse-4c7d889be7ef5c1d123a926fd9481574bd4a6b4d.tar.xz
Merge commit '97647b33c' into dinsic
Diffstat (limited to 'synapse/storage/database.py')
-rw-r--r--synapse/storage/database.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/database.py b/synapse/storage/database.py

index 763722d6bc..0217e63108 100644 --- a/synapse/storage/database.py +++ b/synapse/storage/database.py
@@ -160,7 +160,7 @@ class LoggingDatabaseConnection: self.conn.__enter__() return self - def __exit__(self, exc_type, exc_value, traceback) -> bool: + def __exit__(self, exc_type, exc_value, traceback) -> Optional[bool]: return self.conn.__exit__(exc_type, exc_value, traceback) # Proxy through any unknown lookups to the DB conn class.