diff options
| author | Erik Johnston <erik@matrix.org> | 2017-02-04 08:28:56 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-02-04 08:28:56 +0000 |
| commit | fad3a8433535d7de321350bbd17373138c6fd3ec (patch) | |
| tree | 70fe66754b86a7a6b1466030dcc8d7e260063f4d /synapse/rest/client/transactions.py | |
| parent | Bump version and changelog (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-fad3a8433535d7de321350bbd17373138c6fd3ec.tar.xz | |
Merge branch 'release-v0.19.0' of github.com:matrix-org/synapse v0.19.0
Diffstat (limited to 'synapse/rest/client/transactions.py')
| -rw-r--r-- | synapse/rest/client/transactions.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/rest/client/transactions.py b/synapse/rest/client/transactions.py index 351170edbc..efa77b8c51 100644 --- a/synapse/rest/client/transactions.py +++ b/synapse/rest/client/transactions.py @@ -86,7 +86,11 @@ class HttpTransactionCache(object): pass # execute the function instead. deferred = fn(*args, **kwargs) - observable = ObservableDeferred(deferred) + + # 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()) return observable.observe() |