diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-20 17:24:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-20 17:24:23 +0000 |
| commit | 1b64cb019e578c9e140bdbfef9762e811e5681b5 (patch) | |
| tree | d5d1c71f050d27e929daa72954704ad330cc9194 /synapse/http/matrixfederationclient.py | |
| parent | Mention report_stats in upgrade.rst (diff) | |
| parent | Fix typo (diff) | |
| download | synapse-1b64cb019e578c9e140bdbfef9762e811e5681b5.tar.xz | |
Merge branch 'erikj/perspective_limiter' into release-v0.11.1
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 4e6572df72..b7b7c2cce8 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -302,7 +302,7 @@ class MatrixFederationHttpClient(object): defer.returnValue(json.loads(body)) @defer.inlineCallbacks - def post_json(self, destination, path, data={}): + def post_json(self, destination, path, data={}, long_retries=True): """ Sends the specifed json data using POST Args: @@ -311,6 +311,8 @@ class MatrixFederationHttpClient(object): path (str): The HTTP path. data (dict): A dict containing the data that will be used as the request body. This will be encoded as JSON. + long_retries (bool): A boolean that indicates whether we should + retry for a short or long time. Returns: Deferred: Succeeds when we get a 2xx HTTP response. The result @@ -330,6 +332,7 @@ class MatrixFederationHttpClient(object): path.encode("ascii"), body_callback=body_callback, headers_dict={"Content-Type": ["application/json"]}, + long_retries=True, ) if 200 <= response.code < 300: |