Merge pull request #3169 from janow25/docker-health-check

Added Docker Health Status Support
11 months ago · de74efb2e6
parent 9ee2780e9e f604d96c5b
commit de74efb2e6
1 changed files with 8 additions and 2 deletions
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@ -626,9 +626,15 @@ class Monitor extends BeanModel {

                    log.debug("monitor", `[${this.name}] Axios Request`);
                    let res = await axios.request(options);
+
                    if (res.data.State.Running) {
-                        bean.status = UP;
-                        bean.msg = res.data.State.Status;
+                        if (res.data.State.Health && res.data.State.Health.Status !== "healthy") {
+                            bean.status = PENDING;
+                            bean.msg = res.data.State.Health.Status;
+                        } else {
+                            bean.status = UP;
+                            bean.msg = res.data.State.Health ? res.data.State.Health.Status : res.data.State.Status;
+                        }
                    } else {
                        throw Error("Container State is " + res.data.State.Status);
                    }