fixed logging, archiving of logs and added preliminary db support

Author: winemug

podcomm/definitions.py

@@ -8,6 +8,7 @@
 POD_FILE = "data/pod"
 POD_FILE_SUFFIX = ".json"
 POD_LOG_SUFFIX = ".log"
+POD_DB_SUFFIX = ".db"
 LOG_PATH = "./data"
 OMNIPY_LOGGER = "OMNIPY"
 OMNIPY_LOGFILE = "data/omnipy.log"

podcomm/pod.py

@@ -1,6 +1,6 @@
 from .definitions import *
 import simplejson as json
-from datetime import datetime
+import time
 import sqlite3
 
 class Pod:
@@ -64,6 +64,7 @@ def __init__(self):
         self.var_insertion_date = None
 
         self.path = None
+        self.path_db = None
         self.log_file_path = None
 
         self.last_command = None
@@ -76,27 +77,33 @@ def __init__(self):
 
     def Save(self, save_as = None):
         if save_as is not None:
-            self.path = save_as
+            self.path = save_as + POD_FILE_SUFFIX
             self.log_file_path = save_as + POD_LOG_SUFFIX
+            self.path_db = save_as + POD_DB_SUFFIX
 
         if self.path is None:
-            self.path = "./unnamed_pod.json"
-            self.log_file_path = "./unnamed_pod.log"
+            self.path = POD_FILE + POD_FILE_SUFFIX
+            self.log_file_path = POD_FILE + POD_LOG_SUFFIX
+            self.path_db = POD_FILE + POD_DB_SUFFIX
 
         self.log()
 
         with open(self.path, "w") as stream:
             json.dump(self.__dict__, stream, indent=4, sort_keys=True)
 
     @staticmethod
-    def Load(path, log_file_path=None):
+    def Load(path, log_file_path=None, db_path=None):
         if log_file_path is None:
-            log_file_path = path + POD_LOG_SUFFIX
+            log_file_path = POD_FILE + POD_LOG_SUFFIX
+
+        if db_path is None:
+            db_path = POD_FILE + POD_DB_SUFFIX
 
         with open(path, "r") as stream:
             d = json.load(stream)
             p = Pod()
             p.path = path
+            p.path_db = db_path
             p.log_file_path = log_file_path
 
             p.id_lot = d.get("id_lot", None)
@@ -176,21 +183,31 @@ def __str__(self):
         return json.dumps(self.__dict__, indent=4, sort_keys=True)
 
     def log(self):
-        pass
-
-    def _get_conn(self):
-        conn = sqlite3.connect(self.log_file_path)
-        sql = """ CREATE TABLE IF NOT EXISTS pod_history (
-                  timestamp real, 
-                  pod_state integer, pod_minutes integer, pod_last_command text,
-                  insulin_delivered real, insulin_canceled real, insulin_reservoir real
-                  ) """
-
-        c = conn.cursor()
-        c.execute(sql)
-        return conn
-
-    def _sql(self, sql):
-        conn = sqlite3.connect(self.log_file_path)
-        c = conn.cursor()
-        c.execute(sql)
+        try:
+            with open(self.log_file_path, "a") as stream:
+                json.dump(self.__dict__, stream, sort_keys=True)
+        except:
+            getLogger().exception("Error while writing to log file")
+
+        try:
+            conn = sqlite3.connect(self.path_db)
+            with conn:
+                sql = """ CREATE TABLE IF NOT EXISTS pod_history (
+                          timestamp real, 
+                          pod_state integer, pod_minutes integer, pod_last_command text,
+                          insulin_delivered real, insulin_canceled real, insulin_reservoir real
+                          ) """
+
+                c = conn.cursor()
+                c.execute(sql)
+
+                sql = """ INSERT INTO pod_history (timestamp, pod_state, pod_minutes, pod_last_command,
+                          insulin_delivered, insulin_canceled, insulin_reservoir)
+                          VALUES(?,?,?,?,?,?,?) """
+
+                vals = (time.time(), self.state_progress, self.state_active_minutes,
+                        str(self.last_command), self.insulin_delivered, self.insulin_canceled, self.insulin_reservoir)
+
+                c.execute(sql, vals)
+        except:
+            getLogger().exception("Error while writing to database")

restapi.py

@@ -14,6 +14,7 @@
 from podcomm.pod import Pod
 from podcomm.pr_rileylink import RileyLink
 from podcomm.definitions import *
+from logging import FileHandler
 
 g_key = None
 g_pod = None
@@ -40,10 +41,11 @@ def _get_pod():
     try:
         if g_pod is None:
             if os.path.exists(POD_FILE + POD_FILE_SUFFIX):
-                g_pod = Pod.Load(POD_FILE + POD_FILE_SUFFIX, POD_FILE + POD_LOG_SUFFIX)
+                g_pod = Pod.Load(POD_FILE + POD_FILE_SUFFIX, POD_FILE + POD_LOG_SUFFIX, POD_FILE + POD_DB_SUFFIX)
             else:
                 g_pod = Pod()
                 g_pod.path = POD_FILE + POD_FILE_SUFFIX
+                g_pod.path_db = POD_FILE + POD_DB_SUFFIX
                 g_pod.log_file_path = POD_FILE + POD_LOG_SUFFIX
                 g_pod.Save()
         return g_pod
@@ -63,11 +65,13 @@ def _get_pdm():
         return None
 
 
-def _flush_memory_handler(logger):
+def _flush_handlers(logger):
     for handler in getLogger().handlers:
         if isinstance(handler, MemoryHandler):
             handler.flush()
-
+        if isinstance(handler, FileHandler):
+            handler.flush()
+            handler.close()
 
 def _archive_pod():
     global g_pod
@@ -77,13 +81,16 @@ def _archive_pod():
         g_pdm = None
         archive_name = None
         archive_suffix = datetime.utcnow().strftime("_%Y%m%d_%H%M%S")
+
         if os.path.isfile(POD_FILE + POD_FILE_SUFFIX):
             archive_name = os.rename(POD_FILE + POD_FILE_SUFFIX, POD_FILE + archive_suffix + POD_FILE_SUFFIX)
         if os.path.isfile(POD_FILE + POD_LOG_SUFFIX):
             os.rename(POD_FILE + POD_LOG_SUFFIX, POD_FILE + archive_suffix + POD_LOG_SUFFIX)
+        if os.path.isfile(POD_FILE + POD_DB_SUFFIX):
+            os.rename(POD_FILE + POD_DB_SUFFIX, POD_FILE + archive_suffix + POD_DB_SUFFIX)
 
-        _flush_memory_handler(getLogger())
-        _flush_memory_handler(get_packet_logger())
+        _flush_handlers(getLogger())
+        _flush_handlers(get_packet_logger())
 
         if os.path.isfile(OMNIPY_PACKET_LOGFILE + OMNIPY_LOGFILE_SUFFIX):
             os.rename(OMNIPY_PACKET_LOGFILE + OMNIPY_LOGFILE_SUFFIX, OMNIPY_PACKET_LOGFILE + archive_suffix + OMNIPY_LOGFILE_SUFFIX)
@@ -215,7 +222,7 @@ def archive_pod():
     _verify_auth(request)
     pod = Pod()
     _archive_pod()
-    pod.Save(POD_FILE + POD_FILE_SUFFIX)
+    pod.Save()
 
 def ping():
     return {"pong": None}
@@ -262,7 +269,7 @@ def new_pod():
         pod.radio_address = _get_pdm_address(45000)
 
     _archive_pod()
-    pod.Save(POD_FILE + POD_FILE_SUFFIX)
+    pod.Save()
 
 def activate_pod():
     _verify_auth(request)
@@ -271,7 +278,7 @@ def activate_pod():
     if pod.state_progress >= PodProgress.Running:
         pod = Pod()
         _archive_pod()
-        pod.Save(POD_FILE + POD_FILE_SUFFIX)
+        pod.Save()
 
     pdm = _get_pdm()