Merge pull request #5327 from baude/apiv2hc

add apiv2 healthcheck code

1 files changed, 23 insertions, 1 deletions

diff --git a/pkg/api/handlers/libpod/healthcheck.go b/pkg/api/handlers/libpod/healthcheck.go
index 6c74500b9..6eb2ab0e3 100644
--- a/pkg/api/handlers/libpod/healthcheck.go
+++ b/pkg/api/handlers/libpod/healthcheck.go
@@ -14,8 +14,30 @@ func RunHealthCheck(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		if status == libpod.HealthCheckContainerNotFound {
 			utils.ContainerNotFound(w, name, err)
+			return
 		}
+		if status == libpod.HealthCheckNotDefined {
+			utils.Error(w, "no healthcheck defined", http.StatusConflict, err)
+			return
+		}
+		if status == libpod.HealthCheckContainerStopped {
+			utils.Error(w, "container not running", http.StatusConflict, err)
+			return
+		}
+		utils.InternalServerError(w, err)
+		return
+	}
+	ctr, err := runtime.LookupContainer(name)
+	if err != nil {
 		utils.InternalServerError(w, err)
+		return
 	}
-	utils.WriteResponse(w, http.StatusOK, status)
+
+	hcLog, err := ctr.GetHealthCheckLog()
+	if err != nil {
+		utils.InternalServerError(w, err)
+		return
+	}
+
+	utils.WriteResponse(w, http.StatusOK, hcLog)
 }