Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1803 from matrix-org/erikj/swallow_errors 

Fix spurious Unhandled Error log lines
This commit is contained in:
Erik Johnston 2017-01-13 10:52:41 +00:00 committed by GitHub
parent 7a13fe16f7 ebf94aff8d
commit 0d37a7bf83
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/rest/client/transactions.py
View File

@ -86,7 +86,11 @@ class HttpTransactionCache(object):
pass # execute the function instead. pass # execute the function instead.
deferred = fn(*args, **kwargs) 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()) self.transactions[txn_key] = (observable, self.clock.time_msec())
return observable.observe() return observable.observe()