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

support multiple checktypes with random selection

Browse Source
This commit is contained in:
Username
2025-12-25 20:23:05 +01:00
parent 755abc7f6e
commit 560230988d
2 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config.py
View File

@@ -11,6 +11,8 @@ class Config(ComboParser):
#with open('servers.txt', 'r') as handle:
with open(self.watchd.source_file, 'r') as handle:
self.servers = [x.strip() for x in handle.readlines() if len(x.strip()) > 0]
# Parse checktypes as comma-separated list
self.watchd.checktypes = [t.strip() for t in self.watchd.checktype.split(',') if t.strip()]
# Apply log level from CLI flags
if self.args.quiet:
set_log_level('warn')
@@ -50,10 +52,13 @@ class Config(ComboParser):
if self.ppf.max_fail < 1:
errors.append('ppf.max_fail must be >= 1')
# Validate checktype
# Validate checktypes (comma-separated list)
valid_checktypes = {'irc', 'head', 'judges', 'ssl'}
if self.watchd.checktype not in valid_checktypes:
errors.append('watchd.checktype must be one of: %s' % ', '.join(sorted(valid_checktypes)))
for ct in self.watchd.checktypes:
if ct not in valid_checktypes:
errors.append('watchd.checktype "%s" invalid, must be one of: %s' % (ct, ', '.join(sorted(valid_checktypes))))
if not self.watchd.checktypes:
errors.append('watchd.checktype must specify at least one valid type')
# Validate engine names
valid_engines = {'duckduckgo', 'startpage', 'brave', 'ecosia',
@@ -106,7 +111,7 @@ class Config(ComboParser):
self.add_item(section, 'stale_days', int, 30, 'days after which dead proxies are removed (default: 30)', False)
self.add_item(section, 'stats_interval', int, 300, 'seconds between status reports (default: 300)', False)
self.add_item(section, 'tor_safeguard', bool, True, 'enable tor safeguard (default: True)', False)
self.add_item(section, 'checktype', str, 'ssl', 'check type: irc, head, judges, or ssl', False)
self.add_item(section, 'checktype', str, 'ssl', 'check type(s): irc, head, judges, ssl (comma-separated for random)', False)
section = 'httpd'
self.add_item(section, 'listenip', str, '127.0.0.1', 'address for the httpd to listen to (default: 127.0.0.1)', True)