Merge branch 'vftdan-log-websocket-connection'

config.ini

@@ -42,6 +42,10 @@ list = 1
 auto-reconnect = yes
 reconnect-delay = 1.0
 
+# Change websocket connection opening timeout.
+# It may be useful when initial server connection may take a long time.
+connect-timeout = 60.0
+
 # Number of retries in case request fails. Applies globally
 # Can be changed on per-module basis
 http-retries = 5

mastoposter/__main__.py

@@ -155,6 +155,7 @@ def main():
             ),
             reconnect=conf["main"].getboolean("auto_reconnect", False),
             reconnect_delay=conf["main"].getfloat("reconnect_delay", 1.0),
+            connect_timeout=conf["main"].getfloat("connect_timeout", 60.0),
             list=conf["main"]["list"],
             access_token=conf["main"]["token"],
         )

mastoposter/sources.py

@@ -24,15 +24,22 @@ logger = getLogger("sources")
 
 
 async def websocket_source(
-    url: str, reconnect: bool = False, reconnect_delay: float = 1.0, **params
+    url: str, reconnect: bool = False, reconnect_delay: float = 1.0,
+    connect_timeout: float = 60.0, **params
 ) -> AsyncGenerator[Status, None]:
     from websockets.client import connect
     from websockets.exceptions import WebSocketException
 
-    url = f"{url}?" + urlencode({"stream": "list", **params})
+    param_dict = {"stream": "list", **params}
+    public_param_dict = param_dict.copy()
+    public_param_dict["access_token"] = 'SCRUBBED'
+    public_url = f"{url}?" + urlencode(public_param_dict)
+    url = f"{url}?" + urlencode(param_dict)
     while True:
         try:
-            async with connect(url) as ws:
+            logger.info("attempting to connect to %s", public_url)
+            async with connect(url, open_timeout=connect_timeout) as ws:
+                logger.info("Connected to WebSocket")
                 while (msg := await ws.recv()) is not None:
                     event = loads(msg)
                     logger.debug("data: %r", event)