From 8e41cbfc5b9d1d562784e3151045abb97b84b083 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@eossweden.org>
Date: Mon, 21 Feb 2022 12:54:59 +0100
Subject: [PATCH] src/api/interface.go: remove Name() and define LogInfo()
 instead.

---
 src/api/interface.go | 4 ++--
 src/api/v1.go        | 9 +++++++--
 src/api/v2.go        | 9 +++++++--
 src/server.go        | 5 +++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/api/interface.go b/src/api/interface.go
index d5ec925..607beb6 100644
--- a/src/api/interface.go
+++ b/src/api/interface.go
@@ -7,8 +7,8 @@ import (
 
 type ApiInterface interface {
 
-    // Name of the api
-    Name() string
+    // Returns Logging information
+    LogInfo() []interface{}
 
     // Call api and validate it's status.
     Call() (haproxy.HealthCheckStatus, string)
diff --git a/src/api/v1.go b/src/api/v1.go
index 21ad04b..7c7813b 100644
--- a/src/api/v1.go
+++ b/src/api/v1.go
@@ -20,8 +20,13 @@ func NewEosioV1(params eosapi.ReqParams, block_time float64) EosioV1 {
     }
 }
 
-func (e EosioV1) Name() string {
-    return "v1"
+func (e EosioV1) LogInfo() []interface{} {
+    return []interface{}{
+        "type", "eosio-v1",
+        "url", e.params.Url,
+        "host", e.params.Host,
+        "block_time", e.block_time,
+    }
 }
 
 func (e EosioV1) Call() (haproxy.HealthCheckStatus, string) {
diff --git a/src/api/v2.go b/src/api/v2.go
index b3727a9..67eefbb 100644
--- a/src/api/v2.go
+++ b/src/api/v2.go
@@ -20,8 +20,13 @@ func NewEosioV2(params eosapi.ReqParams, offset int64) EosioV2 {
     }
 }
 
-func (e EosioV2) Name() string {
-    return "v2"
+func (e EosioV2) LogInfo() []interface{} {
+    return []interface{}{
+        "type", "eosio-v2",
+        "url", e.params.Url,
+        "host", e.params.Host,
+        "offset", e.offset,
+    }
 }
 
 func (e EosioV2) Call() (haproxy.HealthCheckStatus, string) {
diff --git a/src/server.go b/src/server.go
index c754a69..b2295cf 100644
--- a/src/server.go
+++ b/src/server.go
@@ -72,8 +72,9 @@ func onTcpMessage(c *tcp_server.Client, args string) {
 
     status, msg := healthCheckApi.Call()
 
-    logger.Info("API Check", "type", healthCheckApi.Name(), "url", a.url,
-        "block", a.block_time / 2, "status", status)
+    logger.Info("API Check", append([]interface{}{
+        "status", status},
+        healthCheckApi.LogInfo()...)...)
 
     if status != haproxy.HealthCheckUp && len(msg) > 0 {
         logger.Warn("API Check Failed", "message", msg)