diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-29 13:49:44 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-29 13:49:44 +0100 |
| commit | 784aaa53dfcd25643088d9347e58b5a746f71f21 (patch) | |
| tree | d1209dc7994aaa650fc2a4765eb501c0fbfb66d7 /synapse/http/matrixfederationclient.py | |
| parent | Add config for setting the recaptcha verify api endpoint, so we can test it i... (diff) | |
| parent | SYN-395: Fix CAPTCHA, don't double decode json (diff) | |
| download | synapse-784aaa53dfcd25643088d9347e58b5a746f71f21.tar.xz | |
Merge branch 'develop' into markjh/SYT-8-recaptcha
Conflicts: synapse/handlers/auth.py
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 6f976d5ce8..7f3d8fc884 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -16,7 +16,7 @@ from twisted.internet import defer, reactor, protocol from twisted.internet.error import DNSLookupError -from twisted.web.client import readBody, _AgentBase, _URI +from twisted.web.client import readBody, _AgentBase, _URI, HTTPConnectionPool from twisted.web.http_headers import Headers from twisted.web._newclient import ResponseDone @@ -103,7 +103,9 @@ class MatrixFederationHttpClient(object): self.hs = hs self.signing_key = hs.config.signing_key[0] self.server_name = hs.hostname - self.agent = MatrixFederationHttpAgent(reactor) + pool = HTTPConnectionPool(reactor) + pool.maxPersistentPerHost = 10 + self.agent = MatrixFederationHttpAgent(reactor, pool=pool) self.clock = hs.get_clock() self.version_string = hs.version_string |