Merge remote-tracking branch 'vector-im/justinbot/connection-limit'

Author: tulir

mautrix/appservice/appservice.py

@@ -63,14 +63,15 @@ def __init__(self, server: str, domain: str, as_token: str, hs_token: str, bot_l
                  real_user_content_key: Optional[str] = "net.maunium.appservice.puppet",
                  state_store: ASStateStore = None, aiohttp_params: Dict = None,
                  ephemeral_events: bool = False, default_ua: str = HTTPAPI.default_ua,
-                 default_http_retry_count: int = 0) -> None:
+                 default_http_retry_count: int = 0, connection_limit: int = None) -> None:
         super().__init__(ephemeral_events=ephemeral_events)
         self.server = server
         self.domain = domain
         self.id = id
         self.verify_ssl = verify_ssl
         self.tls_cert = tls_cert
         self.tls_key = tls_key
+        self.connection_limit = connection_limit or 100
         self.as_token = as_token
         self.hs_token = hs_token
         self.bot_mxid = UserID(f"@{bot_localpart}:{domain}")
@@ -126,10 +127,11 @@ async def __aexit__(self) -> None:
 
     async def start(self, host: str = "127.0.0.1", port: int = 8080) -> None:
         await self.state_store.open()
-        connector = None
         self.log.debug(f"Starting appservice web server on {host}:{port}")
         if self.server.startswith("https://") and not self.verify_ssl:
-            connector = aiohttp.TCPConnector(verify_ssl=False)
+            connector = aiohttp.TCPConnector(limit=self.connection_limit, verify_ssl=False)
+        else:
+            connector = aiohttp.TCPConnector(limit=self.connection_limit)
         default_headers = {"User-Agent": self.default_ua}
         self._http_session = aiohttp.ClientSession(loop=self.loop, connector=connector,
                                                    headers=default_headers)

mautrix/bridge/bridge.py

@@ -115,6 +115,7 @@ def prepare_appservice(self) -> None:
         self.az = AppService(server=self.config["homeserver.address"],
                              domain=self.config["homeserver.domain"],
                              verify_ssl=self.config["homeserver.verify_ssl"],
+                             connection_limit=self.config["homeserver.connection_limit"],
 
                              id=self.config["appservice.id"],
                              as_token=self.config["appservice.as_token"],

mautrix/bridge/config.py

@@ -56,6 +56,7 @@ def do_update(self, helper: ConfigUpdateHelper) -> None:
         copy("homeserver.domain")
         copy("homeserver.verify_ssl")
         copy("homeserver.http_retry_count")
+        copy("homeserver.connection_limit")
         copy("homeserver.status_endpoint")
         copy("homeserver.message_send_checkpoint_endpoint")