inline function

hashicorp · Aug 29, 2019 · b3eb511 · b3eb511
1 parent f0cb17f
commit b3eb511
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/agent/metadata/server.go b/agent/metadata/server.go
@@ -64,10 +64,6 @@ func (s *Server) String() string {
 	return fmt.Sprintf("%s (Addr: %s/%s) (DC: %s)", s.Name, networkStr, addrStr, s.Datacenter)
 }
 
-func (s *Server) HasLeft() bool {
-	return s.Status == serf.StatusLeft
-}
-
 var versionFormat = regexp.MustCompile(`\d+\.\d+\.\d+`)
 
 // IsConsulServer returns true if a serf member is a consul server

diff --git a/agent/router/router.go b/agent/router/router.go
@@ -406,7 +406,7 @@ func (r *Router) GetDatacentersByDistance() ([]string, error) {
 				continue
 			}
 
-			if parts.HasLeft() {
+			if m.Status == serf.StatusLeft {
 				r.logger.Printf("[DEBUG]: consul: server %q in area %q left, skipping",
 					m.Name, areaID)
 				continue