From ddc996f33fc39b2b8f4705d6e1232ccbad1ee4c7 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Wed, 31 May 2017 06:47:27 +0200 Subject: [PLT-5465/APIV4] GET /system/health - Improve ping health check to have limits (#6331) * implement PLT-5465 - Improve ping health check to have limits * update /ping and delete /health * remove permission check --- model/client4.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'model/client4.go') diff --git a/model/client4.go b/model/client4.go index 28434c2e5..fce4c678f 100644 --- a/model/client4.go +++ b/model/client4.go @@ -1737,15 +1737,18 @@ func (c *Client4) GetFileInfosForPost(postId string, etag string) ([]*FileInfo, } } -// General Section - -// GetPing will ping the server and to see if it is up and running. -func (c *Client4) GetPing() (bool, *Response) { - if r, err := c.DoApiGet(c.GetSystemRoute()+"/ping", ""); err != nil { - return false, &Response{StatusCode: r.StatusCode, Error: err} +// General/System Section + +// GetPing will return ok if the running goRoutines are below the threshold and unhealthy for above. +func (c *Client4) GetPing() (string, *Response) { + if r, err := c.DoApiGet(c.GetSystemRoute()+"/ping", ""); r.StatusCode == 500 { + defer r.Body.Close() + return "unhealthy", &Response{StatusCode: r.StatusCode, Error: err} + } else if err != nil { + return "", &Response{StatusCode: r.StatusCode, Error: err} } else { defer closeBody(r) - return CheckStatusOK(r), BuildResponse(r) + return MapFromJson(r.Body)["status"], BuildResponse(r) } } -- cgit v1.2.3-1-g7c22