From 27320017b9d7cbdc2178ba8d7bd80a084511e521 Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Thu, 9 Jan 2014 22:12:08 -0800
Subject: [PATCH] Improve idempotence check for consul service registration

---
 consul/leader.go | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/consul/leader.go b/consul/leader.go
index eb22deeb1b..bec122e652 100644
--- a/consul/leader.go
+++ b/consul/leader.go
@@ -123,6 +123,7 @@ func (s *Server) handleAliveMember(member serf.Member) error {
 	var service *structs.NodeService
 	if valid, _, port := isConsulServer(member); valid {
 		service = &structs.NodeService{
+			ID:      "consul",
 			Service: "consul",
 			Port:    port,
 		}
@@ -130,7 +131,21 @@ func (s *Server) handleAliveMember(member serf.Member) error {
 
 	// Check if the node exists
 	found, addr := state.GetNode(member.Name)
-	if found && addr == member.Addr.String() && service == nil {
+	if found && addr == member.Addr.String() {
+		// Check if the associated service is available
+		if service != nil {
+			match := false
+			services := state.NodeServices(member.Name)
+			for id, _ := range services.Services {
+				if id == service.ID {
+					match = true
+				}
+			}
+			if !match {
+				goto AFTER_CHECK
+			}
+		}
+
 		// Check if the serfCheck is in the passing state
 		checks := state.NodeChecks(member.Name)
 		for _, check := range checks {
@@ -139,6 +154,7 @@ func (s *Server) handleAliveMember(member serf.Member) error {
 			}
 		}
 	}
+AFTER_CHECK:
 	s.logger.Printf("[INFO] consul: member '%s' joined, marking health alive", member.Name)
 
 	// Register with the catalog