Merge pull request #360 from matrix-org/devon/proxy-fix

Explicitly configure the aioapns event loop so proxying works when configured
matrix-org · Feb 15, 2024 · 9c40c7a · 9c40c7a
2 parents e2eaa5c + 4af1120
commit 9c40c7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog.d/360.bugfix b/changelog.d/360.bugfix
@@ -0,0 +1 @@
+Fixed an issue which resulted in proxy configuration being ignored for APNs notifications.
diff --git a/sygnal/apnspushkin.py b/sygnal/apnspushkin.py
@@ -213,6 +213,9 @@ async def make_apns() -> aioapns.APNs:
         # without this, aioapns will retry every second forever.
         self.apns_client.pool.max_connection_attempts = 3
 
+        # without this, aioapns will not use the proxy if one is configured.
+        self.apns_client.pool.loop = loop
+
     def _report_certificate_expiration(self, certfile: str) -> None:
         """Export the epoch time that the certificate expires as a metric."""
         with open(certfile, "rb") as f: