Fix IRC mirror timeout when relaying messages

zulip/integrations/bridge_with_irc/irc-mirror.py → zulip/integrations/bridge_with_irc/irc_mirror.py

@@ -27,7 +27,7 @@
 Note that "_zulip" will be automatically appended to the IRC nick provided
 """
 
-if __name__ == "__main__":
+def main():
     parser = zulip.add_default_arguments(
         argparse.ArgumentParser(usage=usage), allow_provisioning=True
     )
@@ -45,7 +45,7 @@
     options.client = "irc_mirror"
     zulip_client = zulip.init_from_options(options)
     try:
-        from irc_mirror_backend import IRCBot
+        from .irc_mirror_backend import IRCBot
     except ImportError:
         traceback.print_exc()
         print(
@@ -70,3 +70,6 @@
         sasl_password=options.sasl_password,
     )
     bot.start()
+
+if __name__ == "__main__":
+    main()

zulip/integrations/bridge_with_irc/irc_mirror_backend.py

@@ -5,6 +5,7 @@
 
 import irc.bot
 import irc.strings
+import requests
 from irc.client import Event, ServerConnection, ip_numstr_to_quad
 
 
@@ -89,7 +90,16 @@ def forward_to_irc(msg: Dict[str, Any]) -> None:
             for line in msg["content"].split("\n"):
                 send(line)
 
-        z2i = mp.Process(target=self.zulip_client.call_on_each_message, args=(forward_to_irc,))
+        def fresh_session() -> None:
+            # Create a new client so the child doesn't share the parent's SSL
+            # sockets after forking in 'mp.Process'.
+            self.zulip_client.session.close()
+            new_session = requests.Session()
+            new_session.auth = (self.zulip_client.email, self.zulip_client.api_key)
+            self.zulip_client.session = new_session
+            self.zulip_client.call_on_each_message(forward_to_irc)
+
+        z2i = mp.Process(target=fresh_session)
         z2i.start()
 
     def on_privmsg(self, c: ServerConnection, e: Event) -> None:

zulip/setup.py

@@ -60,6 +60,7 @@ def recur_expand(target_root: Any, dir: Any) -> Generator[Tuple[str, List[str]],
             "zulip-send=zulip.send:main",
             "zulip-api-examples=zulip.api_examples:main",
             "zulip-matrix-bridge=integrations.bridge_with_matrix.matrix_bridge:main",
+            "zulip-irc-bridge=integrations.bridge_with_irc.irc_mirror:main",
             "zulip-api=zulip.cli:cli",
         ],
     },