viktor/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

t3-probe: fix aiohttp 3.9 compat (ClientWSTimeout is 3.10+)

Browse source 
Bound connection establishment via session ClientTimeout(total=None,
connect=15) instead — works on 3.9 through current; total must stay None
or the session timeout would kill the long-lived probe WS. Verified by a
local 14s smoke run: cloudflare + internal legs both connect.
This commit is contained in:
Viktor Barzin 2026-06-10 21:26:09 +00:00
parent a734155fb5
commit 70442ccdc6
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
stacks/t3code/probe.py
View file

@ -128,10 +128,13 @@ async def ws_leg(leg, resolver):
reason = "connect_failed"
try:
connector = aiohttp.TCPConnector(resolver=resolver, force_close=True)
async with aiohttp.ClientSession(connector=connector) as session:
async with session.ws_connect(
url, timeout=aiohttp.ClientWSTimeout(ws_close=10), heartbeat=None
) as ws:
# total=None: a session-level total timeout would kill the
# long-lived WS; only connection establishment is bounded.
async with aiohttp.ClientSession(
connector=connector,
timeout=aiohttp.ClientTimeout(total=None, connect=15, sock_connect=15),
) as session:
async with session.ws_connect(url, heartbeat=None) as ws:
established = time.monotonic()
attempts = 0
CONNECTED.labels(leg).set(1)