From 27a68bb651bca0b4734c024771db532cf18fb11e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Sun, 25 Sep 2022 02:15:26 +0200 Subject: [PATCH] Improve the health function --- components.go | 10 ++++++++-- interface.go | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/components.go b/components.go index 5792110..ffb36de 100644 --- a/components.go +++ b/components.go @@ -163,8 +163,14 @@ func (c *Components) Health(context context.Context) HealthInfoMap { result := make(HealthInfoMap, len(c.components)) for _, component := range c.components { - m, e := component.Health(context) - result[component.Name()] = HealthInfo{Message: m, IsError: e} + err := component.Health(context) + m := "All fine" + isError := false + if err != nil { + m = err.Error() + isError = true + } + result[component.Name()] = HealthInfo{Message: m, IsError: isError} } return result diff --git a/interface.go b/interface.go index 83f4ba4..a65cf1c 100644 --- a/interface.go +++ b/interface.go @@ -13,8 +13,8 @@ type Component interface { Initialized() bool Init(components *Components, cli *cli.Context) error Stop() error - MergeFlags(components *Components, flags []cli.Flag) []cli.Flag - Health(context context.Context) (string, bool) + MergeFlags(r *Components, flags []cli.Flag) []cli.Flag + Health(context context.Context) error WrapperFunc(ctx context.Context, req server.Request, rsp interface{}) error }