Create last_exec file after creating dirs, throw 500 if errors on access

Author: c-simpson

src/server/Dockerfile

@@ -15,12 +15,14 @@ RUN pip install --no-cache-dir -r /requirements.txt
 COPY . .
 
 RUN mkdir /app/static \
-          /app/static/raw_data \
-          /app/static/raw_data/current \
-          /app/static/output \
-          /app/static/output/reports \
-          /app/static/logs \
-          /app/static/zipped
+    /app/static/raw_data \
+    /app/static/raw_data/current \
+    /app/static/output \
+    /app/static/output/reports \
+    /app/static/logs \
+    /app/static/zipped
+
+RUN [ ! -f /app/static/logs/last_execution.json ] && printf null > /app/static/logs/last_execution.json
 
 RUN chmod -R 777 /app/static
 

src/server/api/admin_api.py

@@ -118,8 +118,19 @@ def listStatistics():
         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:
-        return jsonify(None)
+        current_app.logger.error("Failure reading last_execution.json: ", e)
+        return abort(500)
 
     return jsonify(last_execution_details)