From cb9c465707f265fb2b4606269495ddb53d84db05 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 15 Apr 2016 10:21:32 +0100 Subject: [PATCH] Use SynapseError 504 for Timeout errors --- synapse/util/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index b462495eb..2b3f0bef3 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +from synapse.api.errors import SynapseError from synapse.util.logcontext import PreserveLoggingContext from twisted.internet import defer, reactor, task @@ -80,7 +81,7 @@ class Clock(object): def timed_out_fn(): try: - ret_deferred.errback(RuntimeError("Timed out")) + ret_deferred.errback(SynapseError(504, "Timed out")) except: pass