hkc
/
mastoposter
2
0
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set websocket open timeout to 1 minute and log connection attempts #3

Merged
hkc merged 3 commits from vftdan/mastoposter:log-websocket-connection into master 2024-06-12 23:32:35 +03:00
Conversation 3 Commits 3 Files Changed 3 +15 -3
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.ini
View File

@ -42,6 +42,10 @@ list = 1
auto-reconnect = yes auto-reconnect = yes
reconnect-delay = 1.0 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 # Number of retries in case request fails. Applies globally
# Can be changed on per-module basis # Can be changed on per-module basis
http-retries = 5 http-retries = 5

1
mastoposter/__main__.py
View File

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

13
mastoposter/sources.py
View File

@ -24,15 +24,22 @@ logger = getLogger("sources")
async def websocket_source( 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]: ) -> AsyncGenerator[Status, None]:
from websockets.client import connect from websockets.client import connect
from websockets.exceptions import WebSocketException 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: while True:
try: try:
hkc commented 2024-06-08 18:08:49 +03:00
Outdated
Review
Copy Link

maybe respect timeout option from main config here?

maybe respect timeout option from main config here?
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: while (msg := await ws.recv()) is not None:
event = loads(msg) event = loads(msg)
logger.debug("data: %r", event) logger.debug("data: %r", event)