summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-28 16:48:53 +0100
committerErik Johnston <erik@matrix.org>2015-05-28 16:48:53 +0100
commit79e37a7ecbb566f63393ee47728e5cddfdc2810e (patch)
tree4ef6245ffc86cb1f6af9d180caf53e821e85cbaa /synapse/http
parentMerge pull request #168 from matrix-org/erikj/conn_pool (diff)
downloadsynapse-79e37a7ecbb566f63393ee47728e5cddfdc2810e.tar.xz
Correctly pass connection pool parameter
Diffstat (limited to '')
-rw-r--r--synapse/http/client.py2
-rw-r--r--synapse/http/matrixfederationclient.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 8d6e89d6e7..e746f2416e 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -58,7 +58,7 @@ class SimpleHttpClient(object):
         # 'like a browser'
         pool = HTTPConnectionPool(reactor)
         pool.maxPersistentPerHost = 10
-        self.agent = Agent(reactor, pool)
+        self.agent = Agent(reactor, pool=pool)
         self.version_string = hs.version_string
 
     def request(self, method, *args, **kwargs):
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 44f0b00333..7f3d8fc884 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -105,7 +105,7 @@ class MatrixFederationHttpClient(object):
         self.server_name = hs.hostname
         pool = HTTPConnectionPool(reactor)
         pool.maxPersistentPerHost = 10
-        self.agent = MatrixFederationHttpAgent(reactor, pool)
+        self.agent = MatrixFederationHttpAgent(reactor, pool=pool)
         self.clock = hs.get_clock()
         self.version_string = hs.version_string