From b0354e35032692ab4388cbb37e76a5c596c8dcac Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Fri, 28 May 2021 14:20:41 +0200 Subject: [PATCH] Don't misuse loop as if --- pkg/icingadb/ha.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/icingadb/ha.go b/pkg/icingadb/ha.go index a42b7265..e6b05ba3 100644 --- a/pkg/icingadb/ha.go +++ b/pkg/icingadb/ha.go @@ -179,19 +179,17 @@ func (h *HA) realize(s *icingaredisv1.IcingaStatus, t *types.UnixMilli, shouldLo return err } takeover := true - for rows.Next() { + if rows.Next() { instance := &v1.IcingadbInstance{} err := rows.StructScan(instance) if err != nil { h.logger.Errorw("Can't scan currently active instance", zap.Error(err)) - break + } else { + if shouldLog { + h.logger.Infow("Another instance is active", "instance_id", instance.Id, zap.String("environment", s.Environment), "heartbeat", instance.Heartbeat, zap.Duration("heartbeat_age", time.Since(instance.Heartbeat.Time()))) + } + takeover = false } - - if shouldLog { - h.logger.Infow("Another instance is active", "instance_id", instance.Id, zap.String("environment", s.Environment), "heartbeat", instance.Heartbeat, zap.Duration("heartbeat_age", time.Since(instance.Heartbeat.Time()))) - } - takeover = false - break } _ = rows.Close() i := v1.IcingadbInstance{