Merge pull request #21 from rumd3x/hotfix/healthcheck

Healthcheck fix + some fine tuning and extra check

Author: rumd3x

Dockerfile

@@ -16,7 +16,7 @@ RUN mkdir -p /usr/src/app/.node-persist
 RUN touch /usr/src/app/.node-persist/jobs.crontab
 RUN cat /usr/src/app/.node-persist/jobs.crontab | crontab
 
-HEALTHCHECK --interval=20s --timeout=10s --start-period=5s --retries=3 CMD curl --connect-timeout 4 --max-time 6 --fail -I localhost/probe
+HEALTHCHECK --interval=60s --timeout=3s --start-period=5s --retries=3 CMD curl --connect-timeout 1 --max-time 2 --fail -I localhost/probe
 
 EXPOSE 80
 

routes/routes.js

@@ -19,14 +19,15 @@ const register = (app) => {
     });
 
     app.get("/probe", (req, res) => {
-        let cronStatus = utils.getCronStatus();
+        let cron = utils.getCronStatus();
+        let docker = utils.getDockerStatus();
 
-        if (cronStatus.status !== "cron is running.") {
-            res.status(500);
+        if (!cron.healthy || !docker.healthy) {
+            res.status(500).json({"data": "NOK", "message": "Healthcheck failed."});
             return;
         }
 
-        res.status(200);
+        res.status(200).json({"data": "OK", "message": "Healthcheck passed."});
     });
 
     app.get("/api/time", async (req, res) => {

utils/utils.js

@@ -49,10 +49,18 @@ const getLogs = (job) => {
 }
 
 const getCronStatus = () => {
+    let cronServiceStatus = shell.exec("service cron status", { silent: true });
     return {
-        entries: shell.exec("crontab -l"),
-        status: shell.exec("service cron status")
+        entries: shell.exec("crontab -l", { silent: true }),
+        status: cronServiceStatus,
+        healthy: cronServiceStatus.code === 0
     };
 }
 
-module.exports = { getBiggest, rewriteCronFile, getLogs, getCronStatus }
+const getDockerStatus = () => {
+    return {
+        healthy: shell.exec("docker info", { silent: true }).code === 0
+    };
+};
+
+module.exports = { getBiggest, rewriteCronFile, getLogs, getCronStatus, getDockerStatus }