diff options
| -rwxr-xr-x | monitor/josef_logreader.py | 9 | ||||
| -rwxr-xr-x | monitor/josef_monitor.py | 3 | ||||
| -rwxr-xr-x | monitor/josef_mover.py | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/monitor/josef_logreader.py b/monitor/josef_logreader.py index 3d28146..e1d587f 100755 --- a/monitor/josef_logreader.py +++ b/monitor/josef_logreader.py @@ -104,11 +104,16 @@ def print_overlap(l): entry_count = {} metadata = {"unique":0, "valid":0} total = 0 + + # Prune entries in the end + while(not source in json.loads(log[-1].split("logs: ")[-1][:-1].replace("'", '"'))): + log = log[:-1] + for line in log: # line = item[TIME_LEN:] logs = json.loads(line.split("logs: ")[-1][:-1].replace("'", '"')) - if not source in logs: # don't check entries that were submitted after measurement start - break + # if not source in logs: # don't check entries that were submitted after measurement start + # break if len(logs) == 1: metadata["unique"] += 1 if "pilot" in logs or "rocketeer" in logs or "aviator" in logs: diff --git a/monitor/josef_monitor.py b/monitor/josef_monitor.py index e371c86..fca3199 100755 --- a/monitor/josef_monitor.py +++ b/monitor/josef_monitor.py @@ -348,6 +348,7 @@ class ctlog: def setup_domain_monitoring(): monitored_domains = [] + try: with open(CONFIG.DOMAINS_FILE) as fp: for line in fp: @@ -359,6 +360,8 @@ def setup_domain_monitoring(): monitored_domains.append(md) except IOError: pass + except TypeError: + return for md in CONFIG.MONITORED_DOMAINS: tmp = monitored_domain(md) diff --git a/monitor/josef_mover.py b/monitor/josef_mover.py index a531e3e..a985f65 100755 --- a/monitor/josef_mover.py +++ b/monitor/josef_mover.py @@ -131,7 +131,7 @@ def check_overlap(source, dests): PROCESS_COUNT = 100 for log in source: - print "Checkong overlap from " + log["name"] + print "Checking overlap from " + log["name"] sth = get_sth(log["url"]) first = 0 last = int(sth["tree_size"]) |