diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
| commit | b16cd18a86a530d955d38bbdbc03daa0d70a2f9b (patch) | |
| tree | 8a2e6eb451ec5121affe2afc13ce95ab6fcc4bfd /synapse/storage/keys.py | |
| parent | Doc-string for config ultility function (diff) | |
| parent | Merge pull request #224 from matrix-org/erikj/reactor_metrics (diff) | |
| download | synapse-b16cd18a86a530d955d38bbdbc03daa0d70a2f9b.tar.xz | |
Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails
Diffstat (limited to 'synapse/storage/keys.py')
| -rw-r--r-- | synapse/storage/keys.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/storage/keys.py b/synapse/storage/keys.py index 940a5f7e08..49b8e37cfd 100644 --- a/synapse/storage/keys.py +++ b/synapse/storage/keys.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from _base import SQLBaseStore, cached +from _base import SQLBaseStore, cachedInlineCallbacks from twisted.internet import defer @@ -71,8 +71,7 @@ class KeyStore(SQLBaseStore): desc="store_server_certificate", ) - @cached() - @defer.inlineCallbacks + @cachedInlineCallbacks() def get_all_server_verify_keys(self, server_name): rows = yield self._simple_select_list( table="server_signature_keys", @@ -132,7 +131,7 @@ class KeyStore(SQLBaseStore): desc="store_server_verify_key", ) - self.get_all_server_verify_keys.invalidate(server_name) + self.get_all_server_verify_keys.invalidate((server_name,)) def store_server_keys_json(self, server_name, key_id, from_server, ts_now_ms, ts_expires_ms, key_json_bytes): |