minor fixes

4 files changed, 20 insertions, 9 deletions

diff --git a/monitor/josef_leveldb.py b/monitor/josef_leveldb.py
index 9c6f77d..1b6dacc 100755
--- a/monitor/josef_leveldb.py
+++ b/monitor/josef_leveldb.py
@@ -15,7 +15,7 @@ dbs = {}
 
 def match_domain(d1, d2):
     # Exact match
-    if d1 == d2:
+    if str(d1) == str(d2):
         return True
     
     # Wildcard match
diff --git a/monitor/josef_logreader.py b/monitor/josef_logreader.py
index 05ee969..703ae98 100755
--- a/monitor/josef_logreader.py
+++ b/monitor/josef_logreader.py
@@ -45,7 +45,7 @@ def print_log_stats(l):
             size = line.split("Size: ")[1].split(",")[0]
             # print line[:-1]
             print "STH age: " + str(age)[:-7]
-            print "Size: " + size
+            print "Tree Size: " + size
             break
     else:
         print "No STH update found in log."
@@ -74,11 +74,11 @@ def print_average_age(l):
 
     if not len(delays) == 0:
         average_timedelta = sum(delays, datetime.timedelta(0)) / len(delays)
-        print "Average publish delay: " + str(average_timedelta) + " (" + str(len(delays)) + " values)"
+        print "Average publish delay: " + str(average_timedelta).split('.')[0] + " (" + str(len(delays)) + " values)"
 
     if not len(ages) == 0:
         average_timedelta = sum(ages, datetime.timedelta(0)) / len(ages)
-        print "Average update time: " + str(average_timedelta) + " (" + str(len(ages)) + " values)"
+        print "Average update time: " + str(average_timedelta).split('.')[0] + " (" + str(len(ages)) + " values)"
 
 def print_errors(l):
     # print errors since last restart
diff --git a/monitor/josef_monitor.py b/monitor/josef_monitor.py
index a32cf7d..d9b65a1 100755
--- a/monitor/josef_monitor.py
+++ b/monitor/josef_monitor.py
@@ -49,6 +49,15 @@ class ctlog:
         self.root_hash = None
         self.build = build
 
+        if CONFIG.DB_PATH:
+            self.dbdir = CONFIG.DB_PATH
+            # self.dbdir = CONFIG.DB_PATH + name + "/"
+            if not os.path.exists(self.dbdir):
+                os.makedirs(self.dbdir)
+
+        else:
+            self.dbdir = None
+
         self.log("Starting monitor")
 
 
@@ -71,8 +80,9 @@ class ctlog:
 
             if self.entries != start_size:
                 if verify_subtree(self.sth, self.subtree, self.url):
-                    self.log("Successfully build tree with " + str(self.entries - start_size) + \
-                        " new entries. Size: " + str(self.entries))
+                    pass
+                    # self.log("Successfully build tree with " + str(self.entries - start_size) + \
+                    #     " new entries. Size: " + str(self.entries))
                 else:
                     self.log("ERROR Failed to build tree from entries.")
 
@@ -88,8 +98,8 @@ class ctlog:
                     tmp_data["leaf_hash"] = base64.b64encode(entry_hash)
                     tmp_cert_data.append(tmp_data)
                 new_leafs.append(entry_hash)
-            if CONFIG.DB_PATH:
-                db_add_certs(CONFIG.DB_PATH, tmp_cert_data)
+            if self.dbdir:
+                db_add_certs(self.dbdir, tmp_cert_data)
             if CONFIG.DEFAULT_CERT_FILE:
                 append_file(CONFIG.DEFAULT_CERT_FILE, tmp_cert_data)
             subtree = reduce_tree(new_leafs, subtree)
diff --git a/monitor/monitor_conf_devp.py b/monitor/monitor_conf_devp.py
index 19df6ac..ff6448d 100644
--- a/monitor/monitor_conf_devp.py
+++ b/monitor/monitor_conf_devp.py
@@ -34,7 +34,8 @@ CTLOGS = [
     {"name" : "devp",
     "url" : "https://localhost:8080/",
     "key" : "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAc3Nq8pw8qI7bYYbZJ5F5xmCd2cmkl8Y9P6CzpaHubMzrD1C+3sc07w1krKJAIT9a5SpFa4kd3TxQvDIIh0PUA==",
-    "id" : 'hcp4WfkRei42og2wcWSgTqpa8muRXnuxF8HP6PVKbDA='},
+    "id" : 'hcp4WfkRei42og2wcWSgTqpa8muRXnuxF8HP6PVKbDA=',
+    "build" : True},
 
     # {"name" : "pilot",
     # "url" : "https://ct.googleapis.com/pilot/",