monitor: more code simplification

stack/monitor/buildout.cfg

@@ -53,7 +53,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/${:filename}
 download-only = true
-md5sum = 49587347fd82d93cca27715f787f8bec
+md5sum = 5b12e864f1762d7984f7d4863d0b795d
 destination = ${buildout:parts-directory}/monitor-template-monitor-bin
 filename = monitor.py.in
 mode = 0644

stack/monitor/monitor.py.in

 #!{{ python_executable }}
 
-import datetime
 import json
 import os
 import subprocess
@@ -60,10 +59,8 @@ class Popen(subprocess.Popen):
       return event.__killed
     return killed
 
-def init_db():
-  db = sqlite3.connect(db_path)
-  c = db.cursor()
-  c.executescript("""
+def init_db(db):
+  db.executescript("""
 CREATE TABLE IF NOT EXISTS status (
   timestamp INTEGER UNIQUE,
   status VARCHAR(255));
@@ -73,8 +70,6 @@ CREATE TABLE IF NOT EXISTS individual_status (
   element VARCHAR(255),
   output TEXT);
 """)
-  db.commit()
-  db.close()
 
 def getListOfScripts(directory):
   """
@@ -136,25 +131,20 @@ def runScripts(directory):
 
 def writeFiles(monitors):
   timestamp = int(time.time())
-  date = datetime.datetime.now().ctime()
-  init_db()
   db = sqlite3.connect(db_path)
-  fail = False
+  init_db(db)
+  status = SUCCESS
   for key, value in monitors.iteritems():
-    element_status = SUCCESS
-    if value != "" :
-      fail = True
-      element_status = FAILURE
+    if value:
+      element_status = status = FAILURE
+    else:
+      element_status = SUCCESS
     db.execute("insert into individual_status(timestamp, element, output, status) values (?, ?, ?, ?)", (timestamp, key, value, element_status))
-  db.commit()
-  status = SUCCESS
-  if fail:
-    status = FAILURE
   db.execute("insert into status(timestamp, status) values (?, ?)", (timestamp, status))
   db.commit()
   db.close()
-  monitors['datetime'] = date
-  open(monitoring_file_json, "w+").write(json.dumps(monitors))
+  monitors['datetime'] = time.ctime(timestamp)
+  json.dump(monitors, open(monitoring_file_json, "w+"))
 
 def main():
   parser = OptionParser(option_list=option_list)