From c168e263df03017d6c5535955000410d85eac6b1 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Wed, 26 Oct 2022 10:29:25 +0200 Subject: [PATCH] src/server.go: in onTcpMessage() cleanup logging calls using api.LogParams Add and Combine functions. --- src/server.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/server.go b/src/server.go index 9b55f6a..67d4f5d 100644 --- a/src/server.go +++ b/src/server.go @@ -2,6 +2,7 @@ package main import ( "strings" + "github.com/eosswedenorg/eosio-api-healthcheck/src/api" "github.com/eosswedenorg-go/haproxy/agentcheck" "github.com/eosswedenorg-go/tcp_server" ) @@ -25,14 +26,14 @@ func onTcpMessage(c *tcp_server.Client, args string) { status, msg := healthCheckApi.Call() - logger.Info("API Check", append([]interface{}{ - "status", strings.TrimSpace(status.String())}, - healthCheckApi.LogInfo().ToSlice()...)...) + params := api.LogParams{} + params.Add("status", strings.TrimSpace(status.String())) if msg != "OK" && len(msg) > 0 { - logger.Warn("API Check Failed", "message", msg) + params.Add("error", msg) } + logger.Info("API Check", params.Combine(healthCheckApi.LogInfo())...) // Report status to HAproxy c.WriteString(status.String()) c.Close()