Compare commits
2
Commits
e44c8950ee
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d5caac8d8 | ||
|
|
5699aa9dde |
+1
-1
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "aioproxies"
|
name = "aioproxies"
|
||||||
version = "1.0.0"
|
version = "1.1.0"
|
||||||
description = "proxy parsing, formatting, health, and pool management for aiohttp/aioweb, camoufox, and socks5"
|
description = "proxy parsing, formatting, health, and pool management for aiohttp/aioweb, camoufox, and socks5"
|
||||||
requires-python = ">=3.10"
|
requires-python = ">=3.10"
|
||||||
dependencies = []
|
dependencies = []
|
||||||
|
|||||||
+14
-1
@@ -6,11 +6,24 @@ calling a function without it raises a clear error.
|
|||||||
"""
|
"""
|
||||||
import logging
|
import logging
|
||||||
from typing import Optional, Union
|
from typing import Optional, Union
|
||||||
|
from urllib.parse import urlsplit, urlunsplit
|
||||||
|
|
||||||
from .proxy import Proxy, to_proxy
|
from .proxy import Proxy, to_proxy
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def _safe_url(url: str) -> str:
|
||||||
|
"""strip query + fragment from a url for logging - a provider reset url can carry a
|
||||||
|
rotation token in its query/path; this drops the query/fragment (the usual token spot)
|
||||||
|
so the log line can't leak it. falls back to the raw url only if it won't parse"""
|
||||||
|
try:
|
||||||
|
parts = urlsplit(url)
|
||||||
|
except ValueError:
|
||||||
|
return url
|
||||||
|
return urlunsplit((parts.scheme, parts.netloc, parts.path, "", ""))
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import aiohttp
|
import aiohttp
|
||||||
|
|
||||||
@@ -55,7 +68,7 @@ async def reset(reset_url: str, *, timeout: float = 15.0) -> bool:
|
|||||||
async with aiohttp.ClientSession(timeout=t) as session:
|
async with aiohttp.ClientSession(timeout=t) as session:
|
||||||
async with session.get(reset_url) as resp:
|
async with session.get(reset_url) as resp:
|
||||||
ok = resp.status == 200
|
ok = resp.status == 200
|
||||||
log.info("proxy reset %s -> %s", reset_url, resp.status)
|
log.info("proxy reset %s -> %s", _safe_url(reset_url), resp.status)
|
||||||
return ok
|
return ok
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
log.warning("proxy reset failed: %s", exc)
|
log.warning("proxy reset failed: %s", exc)
|
||||||
|
|||||||
Reference in New Issue
Block a user