Merge branch 'changes3' into 'master'
proxywatchd: improve logging See merge request mserneels/ppf!3
This commit is contained in:
@@ -117,7 +117,7 @@ class WorkerThread():
|
|||||||
if self.done.is_set(): break
|
if self.done.is_set(): break
|
||||||
time.sleep(0.01)
|
time.sleep(0.01)
|
||||||
if self.thread:
|
if self.thread:
|
||||||
_log("thread %s terminated", self.id)
|
_log("thread terminated", self.id)
|
||||||
|
|
||||||
class Proxywatchd():
|
class Proxywatchd():
|
||||||
|
|
||||||
@@ -177,6 +177,7 @@ class Proxywatchd():
|
|||||||
self.collected.extend(wt.collect())
|
self.collected.extend(wt.collect())
|
||||||
|
|
||||||
def submit_collected(self):
|
def submit_collected(self):
|
||||||
|
_log("watchd main thread: updating %d entries"%len(self.collected))
|
||||||
self._prep_db()
|
self._prep_db()
|
||||||
query = 'UPDATE proxylist SET failed=?,tested=?,dronebl=?,country=?,proto=?,duration=? WHERE proxy=?'
|
query = 'UPDATE proxylist SET failed=?,tested=?,dronebl=?,country=?,proto=?,duration=? WHERE proxy=?'
|
||||||
args = [ (job.failcount, job.nextcheck, 1, 'unknown', job.proto, job.duration, job.proxy) for job in self.collected ]
|
args = [ (job.failcount, job.nextcheck, 1, 'unknown', job.proto, job.duration, job.proxy) for job in self.collected ]
|
||||||
|
|||||||
Reference in New Issue
Block a user