OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3178 from matrix-org/rav/fix_request_timeouts 

fix http request timeout code
pull/2225/merge
Richard van der Hoff 2018-05-03 11:33:26 +01:00 committed by GitHub
parent d72faf2fad 1dfd650348
commit a2aaa9cb3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/http/__init__.py
View File

@ -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