fix

1 files changed, 9 insertions, 10 deletions

diff --git a/monitor/josef_monitor.py b/monitor/josef_monitor.py
index af5067b..e259bd1 100755
--- a/monitor/josef_monitor.py
+++ b/monitor/josef_monitor.py
@@ -24,21 +24,14 @@ args = parser.parse_args()
 
 # Import from config file
 if os.path.isfile(args.config):
-    moduleNames = [args.config[:-2]]
-    modules = map(__import__, moduleNames)
-    # print modules
+    # moduleNames = 
+    modules = map(__import__, [args.config[:-2]])
     CONFIG = modules[0]
     # from monitor_conf import ctlogs, OUTPUT_DIR, INTERVAL, DEFAULT_CERT_FILE, DB_PATH, MONITORED_DOMAINS, DOMAINS_FILE
 else:
     print "Config file not found!"
     sys.exit()
 
-if not os.path.exists(CONFIG.OUTPUT_DIR):
-    os.makedirs(CONFIG.OUTPUT_DIR)
-
-if not os.path.exists(CONFIG.DB_PATH):
-    os.makedirs(CONFIG.DB_PATH)
-
 
 
 class ctlog:
@@ -422,7 +415,7 @@ def main(args):
         # Main loop: Monitor
         print time.strftime('%H:%M:%S') + " Running... (see logfiles for output)"
         while True:
-            time.sleep(INTERVAL)
+            time.sleep(CONFIG.INTERVAL)
             for log in logs:
                 log.update_roots()
 
@@ -463,6 +456,12 @@ def main(args):
 
 
 if __name__ == '__main__':
+    if not os.path.exists(CONFIG.OUTPUT_DIR):
+        os.makedirs(CONFIG.OUTPUT_DIR)
+
+    if not os.path.exists(CONFIG.DB_PATH):
+        os.makedirs(CONFIG.DB_PATH)
+
     main(args)