summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2017-05-05 11:00:21 +0100
committerKegan Dougal <kegan@matrix.org>2017-05-05 11:00:21 +0100
commitd0debb21162df5e6975d8b19e0365961d5f75ddb (patch)
tree5f60f2b7be4e835664062dac77e73419e6121711 /synapse
parentInclude the clock (diff)
downloadsynapse-d0debb21162df5e6975d8b19e0365961d5f75ddb.tar.xz
Remember how twisted works
Diffstat (limited to 'synapse')
-rw-r--r--synapse/http/client.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 58f12cf8ee..9eba046bbf 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -19,6 +19,7 @@ from synapse.api.errors import (
     CodeMessageException, MatrixCodeMessageException, SynapseError, Codes,
 )
 from synapse.util.logcontext import preserve_context_over_fn
+from synapse.util import logcontext
 import synapse.metrics
 from synapse.http.endpoint import SpiderEndpoint
 
@@ -82,7 +83,6 @@ class SimpleHttpClient(object):
         # counters to it
         outgoing_requests_counter.inc(method)
 
-
         def send_request():
             request_deferred = self.agent.request(
                 method, uri, *args, **kwargs
@@ -104,7 +104,7 @@ class SimpleHttpClient(object):
                 "Received response to  %s %s: %s",
                 method, uri, response.code
             )
-            return response
+            defer.returnValue(response)
         except Exception as e:
             incoming_responses_counter.inc(method, "ERR")
             logger.info(