mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 22:00:22 +00:00
Ordering is important on errbacks so add the cleanup func before creating an ObservableDeferred
This commit is contained in:
parent
808ddf0ae7
commit
d0497425f8
1 changed files with 7 additions and 7 deletions
|
@ -87,19 +87,19 @@ 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
|
|
||||||
# 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())
|
|
||||||
|
|
||||||
# if the request fails with a Twisted failure, remove it
|
# if the request fails with a Twisted failure, remove it
|
||||||
# from the transaction map. This is done to ensure that we don't
|
# from the transaction map. This is done to ensure that we don't
|
||||||
# cache transient errors like rate-limiting errors, etc.
|
# cache transient errors like rate-limiting errors, etc.
|
||||||
def remove_from_map(err):
|
def remove_from_map(err):
|
||||||
self.transactions.pop(txn_key, None)
|
self.transactions.pop(txn_key, None)
|
||||||
return err
|
return err
|
||||||
observable.addErrback(remove_from_map)
|
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()
|
return observable.observe()
|
||||||
|
|
||||||
def _cleanup(self):
|
def _cleanup(self):
|
||||||
|
|
Loading…
Reference in a new issue