From ebf94aff8d8cf6a6ed187b2c8e6aaa69f3912a48 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 12 Jan 2017 17:19:47 +0000
Subject: [PATCH] Fix spurious Unhandled Error log lines
---
synapse/rest/client/transactions.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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()
--
GitLab