summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-02-13 16:29:19 +0100
committerGitHub <noreply@github.com>2017-02-13 16:29:19 +0100
commit359c97f506a5e970bb0b12582468a51cd5897225 (patch)
tree74c4259b701c357fe66c30ecf9958c47fe2e555f /synapse
parentMerge pull request #1912 from matrix-org/markjh/roominitialsync (diff)
parentOrdering is important on errbacks so add the cleanup func before creating an ... (diff)
downloadsynapse-359c97f506a5e970bb0b12582468a51cd5897225.tar.xz
Merge pull request #1913 from matrix-org/kegan/dont-cache-errors
http txns: Do not cache error responses
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/client/transactions.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/synapse/rest/client/transactions.py b/synapse/rest/client/transactions.py
index efa77b8c51..fceca2edeb 100644
--- a/synapse/rest/client/transactions.py
+++ b/synapse/rest/client/transactions.py
@@ -87,9 +87,17 @@ class HttpTransactionCache(object):
 
         deferred = fn(*args, **kwargs)
 
-        # We don't add an errback to the raw deferred, so we ask ObservableDeferred
-        # to swallow the error. This is fine as the error will still be reported
-        # to the observers.
+        # if the request fails with a Twisted failure, remove it
+        # from the transaction map. This is done to ensure that we don't
+        # cache transient errors like rate-limiting errors, etc.
+        def remove_from_map(err):
+            self.transactions.pop(txn_key, None)
+            return err
+        deferred.addErrback(remove_from_map)
+
+        # We don't add any other errbacks to the raw deferred, so we ask
+        # ObservableDeferred to swallow the error. This is fine as the error will
+        # still be reported to the observers.
         observable = ObservableDeferred(deferred, consumeErrors=True)
         self.transactions[txn_key] = (observable, self.clock.time_msec())
         return observable.observe()