summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-05-03 11:33:26 +0100
committerGitHub <noreply@github.com>2018-05-03 11:33:26 +0100
commita2aaa9cb3c513ee67b613814e4ad247e62d55d11 (patch)
tree3691faecf1b81cf2446e50aacebd58b9f8c01938
parentFix changes warning (diff)
parentadd missing param to cancelled_to_request_timed_out_error (diff)
downloadsynapse-a2aaa9cb3c513ee67b613814e4ad247e62d55d11.tar.xz
Merge pull request #3178 from matrix-org/rav/fix_request_timeouts
fix http request timeout code
-rw-r--r--synapse/http/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/__init__.py b/synapse/http/__init__.py
index 0d47ccdb59..054372e179 100644
--- a/synapse/http/__init__.py
+++ b/synapse/http/__init__.py
@@ -25,7 +25,7 @@ class RequestTimedOutError(SynapseError):
         super(RequestTimedOutError, self).__init__(504, "Timed out")
 
 
-def cancelled_to_request_timed_out_error(value):
+def cancelled_to_request_timed_out_error(value, timeout):
     """Turns CancelledErrors into RequestTimedOutErrors.
 
     For use with async.add_timeout_to_deferred