summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-12 20:43:47 +1000
committerGitHub <noreply@github.com>2018-09-12 20:43:47 +1000
commit33716c4aea130a59f704f08f2bd0c32b013a54d4 (patch)
tree6186f4595b23cff3a4ea0ba807fa6a8d3e974cd0 /synapse/storage
parentMerge pull request #3824 from matrix-org/rav/fix_jwt_import (diff)
parentchangelog (diff)
downloadsynapse-33716c4aea130a59f704f08f2bd0c32b013a54d4.tar.xz
Merge pull request #3826 from matrix-org/rav/logging_for_keyring
add some logging for the keyring queue
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/keys.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py
index f547977600..a1331c1a61 100644
--- a/synapse/storage/keys.py
+++ b/synapse/storage/keys.py
@@ -134,6 +134,7 @@ class KeyStore(SQLBaseStore):
         """
         key_id = "%s:%s" % (verify_key.alg, verify_key.version)
 
+        # XXX fix this to not need a lock (#3819)
         def _txn(txn):
             self._simple_upsert_txn(
                 txn,