summary refs log tree commit diff
path: root/synapse/rest/client/v1/base.py
diff options
context:
space:
mode:
authorKegsay <kegsay@gmail.com>2016-11-14 12:45:30 +0000
committerGitHub <noreply@github.com>2016-11-14 12:45:30 +0000
commit9355a5c42b4003ea8749ed077c812ebba9a5f7cf (patch)
treed35934cc8031e0ddb4dfc2ad6f028e628d226481 /synapse/rest/client/v1/base.py
parentMerge pull request #1625 from DanielDent/patch-1 (diff)
parentClean transactions based on time. Add HttpTransactionCache tests. (diff)
downloadsynapse-9355a5c42b4003ea8749ed077c812ebba9a5f7cf.tar.xz
Merge pull request #1624 from matrix-org/kegan/idempotent-requests
Store Promise<Response> instead of Response for HTTP API transactions
Diffstat (limited to 'synapse/rest/client/v1/base.py')
-rw-r--r--synapse/rest/client/v1/base.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/base.py b/synapse/rest/client/v1/base.py
index c2a8447860..c7aa0bbf59 100644
--- a/synapse/rest/client/v1/base.py
+++ b/synapse/rest/client/v1/base.py
@@ -18,7 +18,8 @@
 
 from synapse.http.servlet import RestServlet
 from synapse.api.urls import CLIENT_PREFIX
-from .transactions import HttpTransactionStore
+from synapse.rest.client.transactions import HttpTransactionCache
+
 import re
 
 import logging
@@ -59,4 +60,4 @@ class ClientV1RestServlet(RestServlet):
         self.hs = hs
         self.builder_factory = hs.get_event_builder_factory()
         self.auth = hs.get_v1auth()
-        self.txns = HttpTransactionStore()
+        self.txns = HttpTransactionCache(hs.get_clock())