Skip to content

Optimize update_combined_blacklist.yml to reduce timeout aborts #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 2 commits into from
Closed

Optimize update_combined_blacklist.yml to reduce timeout aborts #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a066cfb
Initial plan
Copilot Apr 15, 2026
4896502
Optimize update_combined_blacklist.yml: reduce timeout/contention, ad…
Copilot Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/update_combined_blacklist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:
jobs:
update:
runs-on: ubuntu-latest
timeout-minutes: 50
timeout-minutes: 70

steps:
- name: Checkout Repository
Expand Down Expand Up @@ -458,15 +458,16 @@ jobs:
try:
req = urllib.request.Request(url, headers={"User-Agent": "NETSHIELD/3.0"})
opener = urllib.request.build_opener(urllib.request.HTTPRedirectHandler())
with opener.open(req, timeout=25) as r:
with opener.open(req, timeout=22) as r:
raw = r.read(READ_LIMIT).decode("utf-8", errors="ignore")
found = parse_entries(raw, use_protected_check=True)
ips = len([e for e in found if '/' not in e])
cidrs = len([e for e in found if '/' in e])
print(f"OK {name}: {ips} IPs" + (f" + {cidrs} CIDRs" if cidrs else ""))
return name, found
except Exception as e:
print(f"ERR {name}: {e}")
print(f"ERR {name}: {type(e).__name__}: {e}")
print(f"::warning file=update_combined_blacklist.yml::Feed fetch failed [{name}]: {type(e).__name__}: {e}")
return name, set()

# ── Alle Feeds parallel laden ──────────────────────────────────────
Expand All @@ -475,10 +476,10 @@ jobs:

ip_feeds_today = {} # ip → set(feed_namen) für diesen Run

with ThreadPoolExecutor(max_workers=15) as executor:
with ThreadPoolExecutor(max_workers=10) as executor:
futures = {executor.submit(fetch_ips, n, u): n for n, (u, _) in SOURCES.items()}
try:
for future in as_completed(futures, timeout=600):
for future in as_completed(futures, timeout=580):
name, ips = future.result()
for ip in ips:
if name in HIGH_QUALITY:
Expand Down Expand Up @@ -596,7 +597,7 @@ jobs:
with ThreadPoolExecutor(max_workers=5) as ex:
futures = {ex.submit(fetch_auto, f): f["name"] for f in auto_feeds}
try:
for future in as_completed(futures, timeout=120):
for future in as_completed(futures, timeout=110):
name, ips = future.result()
for ip in ips:
# Auto-discovered Feeds sind nicht HQ
Expand Down