zobally/tg-ws-proxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better exception logging

Browse source
This commit is contained in:
Flowseal 2026-04-18 15:45:15 +03:00
parent 791708cc3d
commit 0c8d0f160a
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
proxy/bridge.py
View file

@ -175,7 +175,7 @@ async def _cfproxy_fallback(reader, writer, relay_init, label,
break
except Exception as exc:
log.warning("[%s] DC%d%s CF proxy failed: %s",
label, dc, media_tag, exc)
label, dc, media_tag, repr(exc))
if ws is None:
return False
@ -198,7 +198,7 @@ async def _tcp_fallback(reader, writer, dst, port, relay_init, label,
asyncio.open_connection(dst, port), timeout=10)
except Exception as exc:
log.warning("[%s] TCP fallback to %s:%d failed: %s",
label, dst, port, exc)
label, dst, port, repr(exc))
return False
stats.connections_tcp_fallback += 1

2
proxy/config.py
View file

@ -66,7 +66,7 @@ def _fetch_cfproxy_domain_list() -> List[str]:
]
return [_dd(d) for d in encoded]
except Exception as exc:
log.warning("Failed to fetch CF proxy domain list: %s", exc)
log.warning("Failed to fetch CF proxy domain list: %s", repr(exc))
return []

2
proxy/fake_tls.py
View file

@ -214,7 +214,7 @@ async def proxy_to_masking_domain(reader, writer, initial_data: bytes,
asyncio.open_connection(domain, 443), timeout=10)
except Exception as exc:
log.debug("[%s] masking: cannot connect to %s:443: %s",
label, domain, exc)
label, domain, repr(exc))
return
log.debug("[%s] masking -> %s:443", label, domain)

4
proxy/tg_ws_proxy.py
View file

@ -448,7 +448,7 @@ async def _handle_client(reader, writer, secret: bytes):
stats.ws_errors += 1
all_redirects = False
log.warning("[%s] DC%d%s WS connect failed: %s",
label, dc, media_tag, exc)
label, dc, media_tag, repr(exc))
# WS failed -> fallback
if ws is None:
@ -506,7 +506,7 @@ async def _handle_client(reader, writer, secret: bytes):
if getattr(exc, 'winerror', None) == 1236:
log.debug("[%s] connection aborted by local system", label)
else:
log.error("[%s] unexpected OS error: %s", label, exc)
log.error("[%s] unexpected OS error: %s", label, repr(exc))
except Exception as exc:
log.error("[%s] unexpected: %s", label, exc, exc_info=True)
finally:

6
utils/tray_common.py
View file

@ -132,7 +132,7 @@ def load_config() -> dict:
data.setdefault(k, v)
return data
except Exception as exc:
log.warning("Failed to load config: %s", exc)
log.warning("Failed to load config: %s", repr(exc))
return dict(DEFAULT_CONFIG)
@ -242,7 +242,7 @@ def _run_proxy_thread(on_port_busy: Callable[[str], None]) -> None:
try:
loop.run_until_complete(_run(stop_event=stop_ev))
except Exception as exc:
log.error("Proxy thread crashed: %s", exc)
log.error("Proxy thread crashed: %s", repr(exc))
if "Address already in use" in str(exc) or "10048" in str(exc):
on_port_busy(
"Не удалось запустить прокси:\n"
@ -391,7 +391,7 @@ def maybe_notify_update(
):
webbrowser.open(url)
except Exception as exc:
log.debug("Update check failed: %s", exc)
log.debug("Update check failed: %s", repr(exc))
threading.Thread(target=_work, daemon=True, name="update-check").start()