diff --git a/config.ini.sample b/config.ini.sample index b7c9a02..34d1e67 100644 --- a/config.ini.sample +++ b/config.ini.sample @@ -7,6 +7,7 @@ proxy_max_fail = 5 proxy_file = false threads = 10 timeout = 15 +submit_after = 200 [proxyfind] search = true diff --git a/config.py b/config.py index 421c064..ee03201 100644 --- a/config.py +++ b/config.py @@ -4,7 +4,7 @@ _loaded = False def load(): if _loaded: return - global database, maxfail, search, torhosts, watchd_threads, checktime, timeout, read_timeout + global database, maxfail, search, torhosts, watchd_threads, checktime, timeout, read_timeout, submit_after ## read the config files parser = SafeConfigParser() @@ -18,6 +18,7 @@ def load(): torhosts = [ str(i).strip() for i in parser.get('global', 'tor_host').split(',') ] watchd_threads = parser.getint('watcherd', 'threads') timeout = parser.getint('watcherd', 'timeout') + submit_after = parser.getint('watcherd', 'submit_after') # allow overriding select items from the commandline import argparse diff --git a/proxywatchd.py b/proxywatchd.py index addfab1..e7d233e 100644 --- a/proxywatchd.py +++ b/proxywatchd.py @@ -148,6 +148,7 @@ class Proxywatchd(): self.mysqlite = None def __init__(self): config.load() + global submit_after self.in_background = False self.threads = [] self.stopping = threading.Event() @@ -159,7 +160,7 @@ class Proxywatchd(): self.mysqlite.commit() self._close_db() - self.submit_after = 200 # number of collected jobs before writing db + self.submit_after = config.submit_after # number of collected jobs before writing db self.jobs = [] self.collected = []