username/ppf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename --worker-v2 to --worker

Browse Source 
No V1 means no need for the suffix. Update flag, function name,
compose command, log messages, and docs.
This commit is contained in:
Username
2026-02-17 22:30:09 +01:00
parent cb52a978e9
commit 82c909d7c0
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.md
View File

@@ -55,7 +55,7 @@ Optimize only if memory becomes a constraint.
Completed. Removed `--worker` flag, `worker_main()`, `claim_work()`, Completed. Removed `--worker` flag, `worker_main()`, `claim_work()`,
`submit_results()`, `/api/work`, `/api/results`, and related config `submit_results()`, `/api/work`, `/api/results`, and related config
options. V2 (`--worker-v2`) is the only worker protocol. options. `--worker` now routes to the URL-driven protocol.
--- ---

2
compose.worker.yml
View File

@@ -35,4 +35,4 @@ services:
- ./data:/app/data:Z - ./data:/app/data:Z
- ./config.ini:/app/config.ini:ro,Z - ./config.ini:/app/config.ini:ro,Z
- ./servers.txt:/app/servers.txt:ro,Z - ./servers.txt:/app/servers.txt:ro,Z
command: python -u ppf.py --worker-v2 --server ${PPF_MASTER_URL:-http://10.200.1.250:8081} command: python -u ppf.py --worker --server ${PPF_MASTER_URL:-http://10.200.1.250:8081}

2
config.py
View File

@@ -180,4 +180,4 @@ class Config(ComboParser):
self.aparser.add_argument("--worker-key", help="worker authentication key", type=str, default='') self.aparser.add_argument("--worker-key", help="worker authentication key", type=str, default='')
self.aparser.add_argument("--register", help="register as worker with master server", action='store_true', default=False) self.aparser.add_argument("--register", help="register as worker with master server", action='store_true', default=False)
self.aparser.add_argument("--worker-name", help="worker name for registration (default: hostname)", type=str, default='') self.aparser.add_argument("--worker-name", help="worker name for registration (default: hostname)", type=str, default='')
self.aparser.add_argument("--worker-v2", help="run as worker node (URL-driven fetching)", action='store_true', default=False) self.aparser.add_argument("--worker", help="run as worker node", action='store_true', default=False)

16
ppf.py
View File

@@ -328,7 +328,7 @@ def worker_send_heartbeat(server_url, worker_key, tor_ok, tor_ip=None, profiling
def worker_claim_urls(server_url, worker_key, count=5): def worker_claim_urls(server_url, worker_key, count=5):
"""Claim batch of URLs for V2 worker mode.""" """Claim batch of URLs for worker mode."""
url = '%s/api/claim-urls?key=%s&count=%d' % (server_url.rstrip('/'), worker_key, count) url = '%s/api/claim-urls?key=%s&count=%d' % (server_url.rstrip('/'), worker_key, count)
try: try:
@@ -428,8 +428,8 @@ def check_tor_connectivity(tor_hosts):
return working, tor_ip return working, tor_ip
def worker_v2_main(config): def worker_main(config):
"""V2 worker mode -- URL-driven discovery. """Worker mode -- URL-driven discovery.
Claims URLs from master, fetches through Tor, extracts and tests proxies, Claims URLs from master, fetches through Tor, extracts and tests proxies,
reports working proxies back to master. reports working proxies back to master.
@@ -470,7 +470,7 @@ def worker_v2_main(config):
if config.args.register: if config.args.register:
return return
_log('starting worker V2 mode (URL-driven)', 'info') _log('starting worker mode (URL-driven)', 'info')
_log(' server: %s' % server_url, 'info') _log(' server: %s' % server_url, 'info')
_log(' threads: %d' % num_threads, 'info') _log(' threads: %d' % num_threads, 'info')
_log(' url batch: %d' % url_batch_size, 'info') _log(' url batch: %d' % url_batch_size, 'info')
@@ -823,13 +823,13 @@ def worker_v2_main(config):
except KeyboardInterrupt: except KeyboardInterrupt:
elapsed = time.time() - start_time elapsed = time.time() - start_time
_log('worker V2 stopping...', 'info') _log('worker stopping...', 'info')
session.close() session.close()
for wt in threads: for wt in threads:
wt.stop() wt.stop()
for wt in threads: for wt in threads:
wt.term() wt.term()
_log('worker V2 stopped after %s' % format_duration(int(elapsed)), 'info') _log('worker stopped after %s' % format_duration(int(elapsed)), 'info')
_log(' cycles: %d' % cycles, 'info') _log(' cycles: %d' % cycles, 'info')
_log(' urls fetched: %d' % urls_fetched, 'info') _log(' urls fetched: %d' % urls_fetched, 'info')
_log(' proxies found: %d' % proxies_found, 'info') _log(' proxies found: %d' % proxies_found, 'info')
@@ -849,8 +849,8 @@ def main():
sys.exit(1) sys.exit(1)
# Worker mode: URL-driven discovery # Worker mode: URL-driven discovery
if config.args.worker_v2 or config.args.register: if config.args.worker or config.args.register:
worker_v2_main(config) worker_main(config)
return return
proxydb = mysqlite.mysqlite(config.watchd.database, str) proxydb = mysqlite.mysqlite(config.watchd.database, str)