changs

proxywatchd.py

@@ -77,8 +77,9 @@ class WorkerJob():
       if not srv: continue
 
       duration = time.time()
+      #rocksock.RocksockProxyFromURL('socks4://%s' % torhost),
       proxies = [
-        rocksock.RocksockProxyFromURL('socks4://%s' % torhost),
+        rocksock.RocksockProxyFromURL('socks5://%s' % torhost),
         rocksock.RocksockProxyFromURL('%s://%s' % (proto, self.proxy)),
       ]
 
@@ -128,7 +129,8 @@ class WorkerJob():
       self.failcount += failinc
       return
     try:
-      recv = sock.recv(6)
+      #recv = sock.recv(6)
+      recv = sock.recvline()
 
       # good data
       if re.match('^(:|NOTICE)', recv, re.IGNORECASE):
@@ -146,6 +148,9 @@ class WorkerJob():
         torstats = "" if len(config.torhosts)==1 else ' tor: %s;'%tor
         recvstats = "".join([x if x in string.printable and ord(x) > 32 else '.' for x in recv])
         _log('%s://%s (%s) d: %.2f sec(s);%s srv: %s; recv: %s' % (proto, self.proxy, self.country, duration, torstats, srv, recvstats), 'xxxxx')
+      else:
+        print('bad data: %s' %recv.strip())
+        self.failcount += 1
     except KeyboardInterrupt as e:
       raise e
     except rocksock.RocksockException as e:
@@ -210,7 +215,7 @@ class WorkerThread():
       elif not self.thread:
         break
       if self.done.is_set(): break
-      time.sleep(0.01)
+      time.sleep( random.random() / 100)
     if self.thread:
       succ_rate = try_div(success_count, job_count)*100
       avg_succ_t = try_div(duration_success_total, success_count)
@@ -358,13 +363,14 @@ class Proxywatchd():
       if self.in_background:
         wt.start_thread()
       self.threads.append(wt)
-      time.sleep( (random.random()/100) )
+      #time.sleep( (random.random()/100) )
+      time.sleep( (random.random()/10) )
 
     sleeptime = 0
-
     while True:
 
       if self.stopping.is_set():
+        print('stopping is_set')
         if self.in_background: self._cleanup()
         break
 
@@ -378,6 +384,7 @@ class Proxywatchd():
       if self.threads[random.choice(xrange(len(self.threads)))].jobcount() == 0:
         self.collect_unfinished()
         if not len(self.jobs):
+          print('jobs are done ?')
           self.collect_work()
           if not self.submit_collected() and self.tor_safeguard:
             _log("zzZzZzzZ sleeping 1 minute(s) due to tor issues - consider decreasing thread number!", "watchd")