Commit Graph

93 Commits

Author SHA1 Message Date
mickael
1b3ce72efc add and use combining class 2019-01-07 23:19:14 +00:00
mickael
e31ac03f6f avoid double "checktime" usage 2019-01-07 22:09:22 +00:00
mickael
6c8b707637 Merge branch 'master' of ssh://gitlab.com/mserneels/ppf 2019-01-07 21:41:46 +00:00
mickael
1288dca38f fixme: change var names 2019-01-07 21:41:41 +00:00
mserneels
a86cc925be Merge branch 'changes8' into 'master'
watchd: first halfbaked attempt to detect/combat tor issues

See merge request mserneels/ppf!9
2019-01-07 21:38:12 +00:00
rofl0r
dfa90109da watchd: first halfbaked attempt to detect/combat tor issues 2019-01-07 21:35:36 +00:00
mickael
aeff09d2b3 move math function inside the sql statement 2019-01-07 21:11:08 +00:00
mserneels
f47745c8d6 Merge branch 'changes7' into 'master'
Changes7

See merge request mserneels/ppf!8
2019-01-07 18:56:23 +00:00
rofl0r
9d41e21258 remove dead irc servers (DNS NXDOMAIN) 2019-01-07 16:22:26 +00:00
rofl0r
9e8beca4e1 do not treat empty lines as servers 2019-01-07 16:22:06 +00:00
rofl0r
9e3c08fcf4 watchd: do not count name resolution errors as proxy fail 2019-01-07 15:57:15 +00:00
rofl0r
be99b8517b watchd: beautify logging 2019-01-07 15:38:51 +00:00
rofl0r
d93f14ad67 watchd: distribute remaining jobs among threads if one is idle 2019-01-07 15:38:51 +00:00
rofl0r
898c8f36ee ppf: fix cpu hogs 2019-01-07 15:38:51 +00:00
rofl0r
ad7c7fce67 ppf: use timeout and only 1 try for http 2019-01-07 05:37:44 +00:00
rofl0r
497f8b2050 watchd: remove non-printable chars from logged response 2019-01-07 02:54:33 +00:00
rofl0r
c8d93751fe rocksock: bump to latest 2019-01-07 02:53:36 +00:00
mickael
8b15faf84d ppf: change user-agent; use headers 2019-01-06 23:29:30 +00:00
mserneels
1fd4792218 Merge branch 'merge1' into 'master'
Merge1

See merge request mserneels/ppf!7
2019-01-06 22:45:50 +00:00
rofl0r
e51dbe113b watchd: optional debug output 2019-01-06 22:44:18 +00:00
rofl0r
312f77469e watchd: disable some noise in the proxy-found log output 2019-01-06 22:42:16 +00:00
rofl0r
5a6c49d88b watchd: collect stats 2019-01-06 22:42:09 +00:00
mickael
3223cc82c4 use http2.py instead of requests 2019-01-06 22:22:42 +00:00
mickael
62153a6972 bump to latest 2019-01-06 21:34:51 +00:00
mickael
358044ccea watchd: make use of ssl configurable 2019-01-06 20:09:27 +00:00
mickael
0ab3a6d066 connect_socket: fix proto bug 2019-01-06 19:43:05 +00:00
mickael
91654d4b9e remove unused "is_drone_bl()" function 2019-01-06 19:12:42 +00:00
mickael
1a025f102f only load search/bad terms when "search" arg is enabled 2019-01-06 18:31:42 +00:00
mickael
5e9f8baf56 remove unused imports 2019-01-06 18:27:06 +00:00
mickael
e4636df468 delay thread startup 2019-01-06 17:52:56 +00:00
mserneels
03a1c47ff2 Merge branch 'changes5' into 'master'
Changes5

See merge request mserneels/ppf!5
2019-01-06 16:38:44 +00:00
rofl0r
7d8583f7cc no need to re-raise keyboardinterrupt 2019-01-06 16:30:32 +00:00
rofl0r
14e4b832f2 proxywatchd: dont delete timestamp when printing halt msg 2019-01-06 16:29:17 +00:00
rofl0r
6c515d9335 don't continue testing offline proxies 2019-01-06 16:20:29 +00:00
mickael
41ce83a963 rocksock.py: bump to latest 2019-01-06 16:06:17 +00:00
mserneels
114c77dcf8 Merge branch 'changes4' into 'master'
save total_duration as int into the db

See merge request mserneels/ppf!4
2019-01-06 15:40:01 +00:00
rofl0r
a0dcd9fa8f save total_duration as int into the db
without that, the DB saves it as float even though the column type is
INT.

requires a run of

sqlite3 proxylist.sqlite "update proxylist set success_count=0,total_duration=0"

to fix existing entries.
2019-01-06 15:23:23 +00:00
mickael
1adf78119d take care of "failinc" 2019-01-06 14:57:09 +00:00
mickael
cff3e1304c remove rocksockexception block 2019-01-06 14:55:31 +00:00
mickael
0a34833d3d "prettier" thread exit message 2019-01-06 05:13:23 +00:00
mickael
6b4ca67b33 use e.get_failedproxy() 2019-01-06 05:02:02 +00:00
mickael
1f33a632fb update rocksock.py to latest 2019-01-06 04:53:20 +00:00
mickael
c661047381 connect_socket: single srv for all protos 2019-01-06 04:42:17 +00:00
mickael
e872caaa77 catch some rocksock errors
this allows ppf to skip checks when a theorical proxy fails in certain manners
2019-01-06 04:12:57 +00:00
mickael
64d9da9156 sleep even when no proxies are added 2019-01-06 02:58:58 +00:00
mickael
63b77043ac minor changes
remove comments, minimal code reorganization
2019-01-06 01:35:18 +00:00
mickael
aab7ef15d1 remove unnecessary global variable 2019-01-06 01:29:35 +00:00
mickael
ecc6bbce10 spaces2tab 2019-01-06 01:18:08 +00:00
mickael
922b630881 print number of defined threads 2019-01-06 00:51:20 +00:00
mickael
84a1de26c3 sqlite: do not create tables with "duration" column 2019-01-06 00:50:35 +00:00