Error handling and cleanup

Author: c-simpson

src/server/api/admin_api.py

@@ -24,8 +24,6 @@
 def __allowed_file(filename):
     return "." in filename and filename.rsplit(".", 1)[1].lower() in ALLOWED_EXTENSIONS
 
-
-
 kvt = Table("kv_unique", metadata, autoload=True, autoload_with=engine)
 
 
@@ -70,27 +68,31 @@ def execute():
     statistics = get_statistics()
 
     last_execution_details = {"executionTime": current_time, "stats": statistics}
-
     last_ex_json = (json.dumps(last_execution_details))
 
+    # Write Last Execution stats to DB 
     with engine.connect() as connection:
         ins_stmt = insert(kvt).values(
             keycol = 'last_execution_time',
             valcol = last_ex_json,
             )
-
+        # If key already present in DB, do update instead 
         upsert = ins_stmt.on_conflict_do_update(
                 constraint='kv_unique_keycol_key',
                 set_=dict(valcol=last_ex_json)
-        )
-
-        connection.execute(upsert)
+                )
 
+        try:
+            connection.execute(upsert)
+        except Exception as e:
+            current_app.logger.error("Insert/Update failed on Last Execution stats")
+            current_app.logger.exception(e)
 
     return jsonify(success=True)
 
 
 def get_statistics():
+    """ Write Last Execution stats to DB. """
     with engine.connect() as connection:
         query_matches = text("SELECT count(*) FROM (SELECT distinct matching_id from pdp_contacts) as a;")
         query_total_count = text("SELECT count(*) FROM pdp_contacts;")
@@ -108,32 +110,20 @@ def get_statistics():
 
 @admin_api.route("/api/statistics", methods=["GET"])
 def list_statistics():
-    try:
+    """ Pull Last Execution stats from DB. """
 
+    last_execution_details = '{}'  # Empty but valid JSON
 
+    try:
         with engine.connect() as connection:
             s = text("select valcol from kv_unique where keycol = 'last_execution_time';")
             result = connection.execute(s)
             last_execution_details  = result.fetchone()[0]
 
 
-       # last_execution_file = open(LOGS_PATH + "last_execution.json", "r")
-      #   last_execution_details = json.loads(last_execution_file.read())
-        # last_execution_file.close()
-
-    except (FileNotFoundError):
-        current_app.logger.error("last_execution.json file was missing")
-        return abort(500)
-
-    except (json.JSONDecodeError):
-        current_app.logger.error(
-            "last_execution.json could not be decoded - possible corruption"
-        )
-        return abort(500)
-
     except Exception as e:
-        current_app.logger.error("Failure reading last_execution.json: ", e)
-        return abort(500)
+        current_app.logger.error("Failure reading Last Execution stats from DB")
+       # return abort(500)    # Weird but not worth a 500
 
     return last_execution_details