enabling mixed auditing/monitoring. changing timespamp format

1 files changed, 6 insertions, 8 deletions

diff --git a/tools/josef_auditor.py b/tools/josef_auditor.py
index 44eb5f8..d612a83 100755
--- a/tools/josef_auditor.py
+++ b/tools/josef_auditor.py
@@ -110,7 +110,7 @@ def fetch_all_sth():
     return sths
 
 def verify_progress(old, new):
-    print "Verifying progress"
+    # print "Verifying progress"
     try:
         for url in new:
             if new and old and new[url] and old[url]:
@@ -361,7 +361,8 @@ def main(args):
             time.sleep(30)
             new_sth = fetch_all_sth()
             verify_consistency(sth, new_sth)
-            verify_inclusion_all(sth, new_sth)
+            # verify_inclusion_all(sth, new_sth)
+            verify_progress(sth, new_sth)
             sth = new_sth
 
     if args.audit2:
@@ -402,7 +403,7 @@ def main(args):
 
 
 if __name__ == '__main__':
-    # try:
+    try:
         main(parser.parse_args())
         if len(errors) == 0:
             print time.strftime('%H:%M:%S') + " Everything OK."
@@ -411,11 +412,8 @@ if __name__ == '__main__':
             # print "errors found!"
             print_errors(errors)
             sys.exit(NAGIOS_WARN)
-    # except:
-    #     pass
-    # finally:
-    #     # print_timings(timings)
-    #     print_errors(errors)
+    except KeyboardInterrupt:
+        print_errors(errors)