DB schema and warnings cleanup (removed surplus and unnecessary columns from schema and code)

warden3/warden_server/warden_server.py

@@ -425,8 +425,8 @@ class MySQL(Object):
 
     def store_event(self, client, event):
         try:
-            # logging.debug("INSERT INTO events (detected,received,service_id,data) VALUES ('%s', NOW(), '%s', '%s')" % (event['DetectTime'], client["service"]["service_id"], self.con.escape_string(str(event))))
-            self.crs.execute("INSERT INTO events (detected,received,service_id,data) VALUES ('%s', NOW(), '%s', '%s')" % (event['DetectTime'], client["service"]["service_id"], self.con.escape_string(str(event))))
+            # logging.debug("INSERT INTO events (received,service_id,data) VALUES (NOW(), '%s', '%s')" % (event['DetectTime'], client["service"]["service_id"], self.con.escape_string(str(event))))
+            self.crs.execute("INSERT INTO events (received,service_id,data) VALUES (NOW(), '%s', '%s')" % (client["service"]["service_id"], self.con.escape_string(str(event))))
             lastid = self.crs.lastrowid
             # logging.debug(str(lastid))
             for cat in event['Category']:
@@ -813,10 +813,13 @@ class WardenHandler(Object):
             db_errs = self.db.store_event(auth_cl, event)
             if db_errs:
                 errs[i] = db_errs
+                continue
 
             saved += 1
 
-        logging.info("sendEvents(...): Saved %i events" % saved)
+        logging.info("sendEvents: Saved %i events" % saved)
+        if errs:
+            logging.info("sendEvents errors: \n%s\n" % str(errs))
 
         return errs