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

proxywatchd: make checktime constants configurable

Browse Source 
this requires only saving the last checked time in `tested`.
you can run the following sql statement to update the existing values
in the database:
sqlite3 proxylist.sqlite \
"update proxylist set tested=tested-(1800+(failed*3600)) where failed < 6"
This commit is contained in:
rofl0r
2019-01-10 19:47:11 +00:00
committed by mickael
parent 087559637e
commit ef9158015f
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
proxywatchd.py
View File

@@ -20,7 +20,7 @@ class WorkerJob():
self.proxy = proxy
self.proto = proto
self.failcount = failcount
self.nextcheck = None
self.checktime = None
self.success_count = success_count
self.total_duration = total_duration
@@ -103,7 +103,7 @@ class WorkerJob():
return None, None, None, None, None, fail_inc
def run(self):
self.nextcheck = (time.time() + 1800 + ((1+int(self.failcount)) * 3600))
self.checktime = int(time.time())
sock, proto, duration, tor, srv, failinc = self.connect_socket()
if not sock:
@@ -115,7 +115,6 @@ class WorkerJob():
# good data
if re.match('^(:|ERROR|PING|PONG|NOTICE|\*\*\*)', recv, re.IGNORECASE):
duration = (time.time() - duration)
self.nextcheck = (time.time() + 1800)
#match = geolite2.lookup(proxy[0].split(':')[0])
match = None
@@ -241,8 +240,8 @@ class Proxywatchd():
def prepare_jobs(self):
self._prep_db()
q = 'SELECT proxy,proto,failed,success_count,total_duration FROM proxylist WHERE failed<? and tested<? ORDER BY RANDOM()' # ' LIMIT ?'
rows = self.mysqlite.execute(q, (config.watchd.max_fail, time.time())).fetchall()
q = 'SELECT proxy,proto,failed,success_count,total_duration FROM proxylist WHERE failed < ? and (tested + ? + (failed * ?)) < ? ORDER BY RANDOM()' # ' LIMIT ?'
rows = self.mysqlite.execute(q, (config.watchd.max_fail, config.watchd.checktime, config.watchd.perfail_checktime , time.time())).fetchall()
for row in rows:
job = WorkerJob(row[0], row[1], row[2], row[3], row[4])
self.jobs.append(job)
@@ -265,7 +264,7 @@ class Proxywatchd():
args = []
for job in self.collected:
if job.failcount == 0: sc += 1
args.append( (job.failcount, job.nextcheck, 1, 'unknown', job.proto, job.success_count, job.total_duration, job.proxy) )
args.append( (job.failcount, job.checktime, 1, 'unknown', job.proto, job.success_count, job.total_duration, job.proxy) )
success_rate = (float(sc) / len(self.collected)) * 100
ret = True
@@ -275,7 +274,7 @@ class Proxywatchd():
args = []
for job in self.collected:
if job.failcount == 0:
args.append( (job.failcount, job.nextcheck, 1, 'unknown', job.proto, job.success_count, job.total_duration, job.proxy) )
args.append( (job.failcount, job.checktime, 1, 'unknown', job.proto, job.success_count, job.total_duration, job.proxy) )
ret = False
_log("updating %d DB entries (success rate: %.2f%%)"%(len(self.collected), success_rate), 'watchd')