some fixes and cleaning

1 files changed, 4 insertions, 15 deletions

diff --git a/monitor/josef_monitor.py b/monitor/josef_monitor.py
index c46355d..b130404 100755
--- a/monitor/josef_monitor.py
+++ b/monitor/josef_monitor.py
@@ -265,18 +265,6 @@ class ctlog:
             print ERROR_STR + "Could not verify consistency for " + self.url
 
 
-
-def check_domain(raw_entry, log=None):
-    orig_entry = extract_original_entry(raw_entry)
-    try:
-        cert_info = my_get_cert_info(orig_entry[0][0])
-        if log:
-            cert_info["log"] = log[8:-1] # strip generic URL stuff
-        return cert_info
-    except IndexError:
-        return None
-
-        
 # def verify_inclusion_all(old, new):
 #     for url in old:
 #         try:
@@ -364,9 +352,10 @@ def setup_domain_monitoring():
             for line in fp:
                 tmp = json.loads(line)
                 for domain in tmp:
-                    md = monitored_domain(domain["url"])
-                    md.load_entries(domain["entries"])
-                    monitored_domains.append(md)
+                    if domain["url"] in CONFIG.MONITORED_DOMAINS:
+                        md = monitored_domain(domain["url"])
+                        md.load_entries(domain["entries"])
+                        monitored_domains.append(md)
     except IOError:
         pass