From 8e0ab77b1042525cd231d729917da0442aaa2240 Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Thu, 5 Nov 2015 10:39:52 -0800
Subject: [PATCH] Add consul fingerprinter to builtin list; sort list; fix bad
 error in consul fingerprinter

---
 client/fingerprint/consul.go      |  2 +-
 client/fingerprint/fingerprint.go | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/client/fingerprint/consul.go b/client/fingerprint/consul.go
index a8c054e21..01e3a658b 100644
--- a/client/fingerprint/consul.go
+++ b/client/fingerprint/consul.go
@@ -48,7 +48,7 @@ func (f *ConsulFingerprint) Fingerprint(config *client.Config, node *structs.Nod
 	// If we can't hit this URL consul is probably not running on this machine.
 	info, err := consulClient.Agent().Self()
 	if err != nil {
-		return false, fmt.Errorf("Failed to query consul for agent status: %s", err)
+		return false, nil
 	}
 
 	node.Attributes["consul.server"] = strconv.FormatBool(info["Config"]["Server"].(bool))
diff --git a/client/fingerprint/fingerprint.go b/client/fingerprint/fingerprint.go
index 3154aad2b..a0139d485 100644
--- a/client/fingerprint/fingerprint.go
+++ b/client/fingerprint/fingerprint.go
@@ -16,26 +16,28 @@ const EmptyDuration = time.Duration(0)
 // fingerprints available, to provided an ordered iteration
 var BuiltinFingerprints = []string{
 	"arch",
+	"consul",
 	"cpu",
-	"host",
-	"memory",
-	"storage",
-	"network",
 	"env_aws",
 	"env_gce",
+	"host",
+	"memory",
+	"network",
+	"storage",
 }
 
 // builtinFingerprintMap contains the built in registered fingerprints
 // which are available, corresponding to a key found in BuiltinFingerprints
 var builtinFingerprintMap = map[string]Factory{
 	"arch":    NewArchFingerprint,
+	"consul":  NewConsulFingerprint,
 	"cpu":     NewCPUFingerprint,
-	"host":    NewHostFingerprint,
-	"memory":  NewMemoryFingerprint,
-	"storage": NewStorageFingerprint,
-	"network": NewNetworkFingerprinter,
 	"env_aws": NewEnvAWSFingerprint,
 	"env_gce": NewEnvGCEFingerprint,
+	"host":    NewHostFingerprint,
+	"memory":  NewMemoryFingerprint,
+	"network": NewNetworkFingerprinter,
+	"storage": NewStorageFingerprint,
 }
 
 // NewFingerprint is used to instantiate and return a new fingerprint