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

Destructure again

pull/4840/head
Andrew Morgan 2019-03-13 19:04:43 +00:00
parent ee8ba397e8
commit c2d848b80d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
synapse/http/matrixfederationclient.py
View File

@ -190,11 +190,12 @@ class MatrixFederationHttpClient(object):
@defer.inlineCallbacks @defer.inlineCallbacks
def _send_request_with_optional_trailing_slash( def _send_request_with_optional_trailing_slash(
self, self,
request, request,
try_trailing_slash_on_400=False, try_trailing_slash_on_400=False,
backoff_on_404=False, backoff_on_404=False,
**kwargs): **kwargs,
):
"""Wrapper for _send_request which can optionally retry the request """Wrapper for _send_request which can optionally retry the request
upon receiving a combination of a 400 HTTP response code and a upon receiving a combination of a 400 HTTP response code and a
'M_UNRECOGNIZED' errcode. This is a workaround for Synapse <=v0.99.2 'M_UNRECOGNIZED' errcode. This is a workaround for Synapse <=v0.99.2
@ -585,7 +586,7 @@ class MatrixFederationHttpClient(object):
} }
response = yield self._send_request_with_optional_trailing_slash( response = yield self._send_request_with_optional_trailing_slash(
request, try_trailing_slash_on_400, backoff_on_404, send_request_args, request, try_trailing_slash_on_400, backoff_on_404, **send_request_args,
) )
body = yield _handle_json_response( body = yield _handle_json_response(
@ -705,7 +706,7 @@ class MatrixFederationHttpClient(object):
} }
response = yield self._send_request_with_optional_trailing_slash( response = yield self._send_request_with_optional_trailing_slash(
request, try_trailing_slash_on_400, False, send_request_args, request, try_trailing_slash_on_400, False, **send_request_args,
) )
body = yield _handle_json_response( body = yield _handle_json_response(