From e5ffe3114dc3f59722a4211fe125585c9210e0ad Mon Sep 17 00:00:00 2001
From: 0xdcarns <dillon.carns@gmail.com>
Date: Wed, 28 Sep 2022 16:50:57 -0400
Subject: [PATCH] added additional failover qualifieers

---
 ee/initialize.go     | 2 +-
 ee/logic/failover.go | 2 +-
 mq/handlers.go       | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ee/initialize.go b/ee/initialize.go
index 22eb22f2..c6dedb06 100644
--- a/ee/initialize.go
+++ b/ee/initialize.go
@@ -28,11 +28,11 @@ func InitEE() {
 		}
 		// == End License Handling ==
 		AddLicenseHooks()
+		resetFailover()
 	})
 	logic.EnterpriseFailoverFunc = eelogic.SetFailover
 	logic.EnterpriseResetFailoverFunc = eelogic.ResetFailover
 	logic.EnterpriseResetAllPeersFailovers = eelogic.WipeAffectedFailoversOnly
-	resetFailover()
 }
 
 func setControllerLimits() {
diff --git a/ee/logic/failover.go b/ee/logic/failover.go
index 146bd13f..a8930889 100644
--- a/ee/logic/failover.go
+++ b/ee/logic/failover.go
@@ -100,11 +100,11 @@ func WipeAffectedFailoversOnly(nodeid, network string) error {
 	if err != nil {
 		return nil
 	}
+	WipeFailover(nodeid)
 
 	for i := range currentNetworkNodes {
 		currNodeID := currentNetworkNodes[i].ID
 		if currNodeID == nodeid {
-			WipeFailover(nodeid)
 			continue
 		}
 		currMetrics, err := logic.GetMetrics(currNodeID)
diff --git a/mq/handlers.go b/mq/handlers.go
index 4ae3bacc..61829e24 100644
--- a/mq/handlers.go
+++ b/mq/handlers.go
@@ -261,7 +261,9 @@ func updateNodeMetrics(currentNode *models.Node, newMetrics *models.Metrics) boo
 	for _, node := range nodes {
 		if !newMetrics.Connectivity[node.ID].Connected &&
 			len(newMetrics.Connectivity[node.ID].NodeName) > 0 &&
-			node.Connected == "yes" {
+			node.Connected == "yes" &&
+			len(node.FailoverNode) > 0 &&
+			node.Failover != "yes" {
 			newMetrics.FailoverPeers[node.ID] = node.FailoverNode
 		}
 	}