summary refs log tree commit diff
path: root/synapse/http/matrixfederationclient.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-11 09:34:12 +0100
committerGitHub <noreply@github.com>2016-08-11 09:34:12 +0100
commit5202679edc29afe96f8c9ac3addff0b0a8bcfaac (patch)
treecde98e790b3db1a48036b65e971d95758cad847a /synapse/http/matrixfederationclient.py
parentMerge pull request #999 from matrix-org/erikj/measure_more (diff)
parentPEP8 (diff)
downloadsynapse-5202679edc29afe96f8c9ac3addff0b0a8bcfaac.tar.xz
Merge pull request #1000 from matrix-org/erikj/contexts
Clean up TransactionQueue
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
-rw-r--r--synapse/http/matrixfederationclient.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py

index c3589534f8..f93093dd85 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py
@@ -155,9 +155,7 @@ class MatrixFederationHttpClient(object): time_out=timeout / 1000. if timeout else 60, ) - response = yield preserve_context_over_fn( - send_request, - ) + response = yield preserve_context_over_fn(send_request) log_result = "%d %s" % (response.code, response.phrase,) break