From 449ab7d8cbab90d2aa4cf3a0b159c096a82ff62a Mon Sep 17 00:00:00 2001
From: Noah Hilverling <noah.hilverling@icinga.com>
Date: Wed, 18 Sep 2019 15:34:47 +0200
Subject: [PATCH] Fix HA not resuming after being responsible again

---
 ha/ha.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ha/ha.go b/ha/ha.go
index 29a1f306..bd22b983 100644
--- a/ha/ha.go
+++ b/ha/ha.go
@@ -137,6 +137,7 @@ func (h *HA) Run(chEnv chan *Environment) {
 	} else {
 		haLogger.Info("Other instance is active.")
 		h.isActive = false
+		h.lastEventId = "0-0"
 	}
 
 	timerHA := time.NewTimer(time.Second * 15)
@@ -187,6 +188,7 @@ func (h *HA) Run(chEnv chan *Environment) {
 		case <-timerHA.C:
 			haLogger.Info("Icinga 2 sent no heartbeat for 15 seconds, pronouncing dead.")
 			h.isActive = false
+			h.lastEventId = "0-0"
 			h.notifyNotificationListener("*", Notify_StopSync)
 		}
 	}
@@ -208,10 +210,12 @@ func (h *HA) runEventListener() {
 		return
 	}
 
-	result := h.super.Rdbw.XRead(&redis.XReadArgs{Streams: []string{"icinga:dump", h.lastEventId}})
+	result := h.super.Rdbw.XRead(&redis.XReadArgs{Block: -1, Streams: []string{"icinga:dump", h.lastEventId}})
 	streams, err := result.Result()
 	if err != nil {
-		h.super.ChErr <- err
+		if err.Error() != "redis: nil" {
+			h.super.ChErr <- err
+		}
 		return
 	}