mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 01:30:20 +00:00
Merge pull request #1913 from matrix-org/kegan/dont-cache-errors
http txns: Do not cache error responses
This commit is contained in:
commit
359c97f506
1 changed files with 11 additions and 3 deletions
|
@ -87,9 +87,17 @@ class HttpTransactionCache(object):
|
||||||
|
|
||||||
deferred = fn(*args, **kwargs)
|
deferred = fn(*args, **kwargs)
|
||||||
|
|
||||||
# We don't add an errback to the raw deferred, so we ask ObservableDeferred
|
# if the request fails with a Twisted failure, remove it
|
||||||
# to swallow the error. This is fine as the error will still be reported
|
# from the transaction map. This is done to ensure that we don't
|
||||||
# to the observers.
|
# 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)
|
observable = ObservableDeferred(deferred, consumeErrors=True)
|
||||||
self.transactions[txn_key] = (observable, self.clock.time_msec())
|
self.transactions[txn_key] = (observable, self.clock.time_msec())
|
||||||
return observable.observe()
|
return observable.observe()
|
||||||
|
|
Loading…
Reference in a new issue