summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-05-02 22:42:36 +0100
committerRichard van der Hoff <richard@matrix.org>2018-05-02 22:42:36 +0100
commit1dfd650348251508ac044b3db114092b1e857a74 (patch)
treedc0223d48a700c3a6b3f9bd9f0c15fd1a36d55d6
parentMerge pull request #3170 from matrix-org/rav/more_logcontext_leaks (diff)
downloadsynapse-1dfd650348251508ac044b3db114092b1e857a74.tar.xz
add missing param to cancelled_to_request_timed_out_error
This gets two arguments, not one.
Diffstat (limited to '')
-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