From eade7ff4b52242926f776f9fe1335b0662f7b88f Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Thu, 25 Jan 2018 09:48:52 -0800 Subject: [PATCH] Fix lint/comments --- client/servers/manager.go | 15 ++++++++++----- client/servers/manager_internal_test.go | 1 - 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/client/servers/manager.go b/client/servers/manager.go index b684b6cce..dbd9f0426 100644 --- a/client/servers/manager.go +++ b/client/servers/manager.go @@ -52,6 +52,14 @@ type Server struct { DC string } +func (s *Server) Copy() *Server { + return &Server{ + Addr: s.Addr, + addr: s.addr, + DC: s.DC, + } +} + func (s *Server) String() string { s.Lock() defer s.Unlock() @@ -224,9 +232,7 @@ func (m *Manager) GetServers() Servers { copy := make([]*Server, 0, len(m.servers)) for _, s := range m.servers { - ns := new(Server) - *ns = *s - copy = append(copy, ns) + copy = append(copy, s.Copy()) } return copy @@ -263,8 +269,7 @@ func (m *Manager) RebalanceServers() { } if !foundHealthyServer { - m.logger.Printf("[DEBUG] manager: No healthy servers during rebalance, aborting") - return + m.logger.Printf("[DEBUG] manager: No healthy servers during rebalance") } return diff --git a/client/servers/manager_internal_test.go b/client/servers/manager_internal_test.go index c42c74cc0..e6ad03bb3 100644 --- a/client/servers/manager_internal_test.go +++ b/client/servers/manager_internal_test.go @@ -44,7 +44,6 @@ func testManager(t *testing.T) (m *Manager) { func testManagerFailProb(failPct float64) (m *Manager) { logger := log.New(os.Stderr, "", 0) - logger = log.New(os.Stderr, "", log.LstdFlags) shutdownCh := make(chan struct{}) m = New(logger, shutdownCh, &fauxConnPool{failPct: failPct}) return m