diff options
| -rwxr-xr-x | monitor/josef_monitor.py | 12 | ||||
| -rwxr-xr-x | monitor/josef_reader.py | 7 | ||||
| -rw-r--r-- | monitor/monitor_conf_devp.py | 3 |
3 files changed, 14 insertions, 8 deletions
diff --git a/monitor/josef_monitor.py b/monitor/josef_monitor.py index a49c20e..c2307a5 100755 --- a/monitor/josef_monitor.py +++ b/monitor/josef_monitor.py @@ -14,7 +14,10 @@ import errno from copy import deepcopy from josef_lib import * from josef_reader import monitored_domain -from josef_leveldb import db_add_certs, db_open +try: + from josef_leveldb import db_add_certs, db_open +except: + print "No database support found" import os.path @@ -442,9 +445,10 @@ def main(args): # Save info about monitored domains domain_dict = [] - for md in monitored_domains: - domain_dict.append(md.to_dict()) - open(CONFIG.DOMAINS_FILE, 'w').write(json.dumps(domain_dict)) + if len monitored_domains > 0: + for md in monitored_domains: + domain_dict.append(md.to_dict()) + open(CONFIG.DOMAINS_FILE, 'w').write(json.dumps(domain_dict)) diff --git a/monitor/josef_reader.py b/monitor/josef_reader.py index eadd120..6b14b70 100755 --- a/monitor/josef_reader.py +++ b/monitor/josef_reader.py @@ -5,12 +5,15 @@ import sys import time import datetime from josef_lib import * -import leveldb import argparse import json import base64 import subprocess -from josef_leveldb import * +try: + import leveldb + from josef_leveldb import * +except: + print "No database support found." from datetime import datetime as dt import ast from monitor_conf import DB_PATH, MONITORED_DOMAINS, OUTPUT_DIR diff --git a/monitor/monitor_conf_devp.py b/monitor/monitor_conf_devp.py index 9685c9f..19df6ac 100644 --- a/monitor/monitor_conf_devp.py +++ b/monitor/monitor_conf_devp.py @@ -12,8 +12,7 @@ DEFAULT_CERT_FILE = None # DEFAULT_CERT_FILE = OUTPUT_DIR + "cert_data.json" # Set to None to disable database writing -DOMAINS_FILE = OUTPUT_DIR + None -# DOMAINS_FILE = OUTPUT_DIR + "domains.json" +DOMAINS_FILE = OUTPUT_DIR + "domains.json" # Set to None to disable database output # DB_PATH = './tmpdb/' |
