Skip to content

Commit

Permalink
fixup! chore: Improve logging of jumphash server selector
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Haudum <[email protected]>
  • Loading branch information
chaudum committed Sep 30, 2024
1 parent 2b85e7c commit 8321961
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions pkg/util/jumphash/memcached_client_selector.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/cespare/xxhash"
"github.com/facette/natsort"
"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/grafana/gomemcache/memcache"

Expand All @@ -23,7 +24,7 @@ import (
// with consistent DNS names where the naturally sorted order
// is predictable.
type Selector struct {
name string
logger log.Logger
mu sync.RWMutex
addrs []net.Addr
resolveUnixAddr UnixResolver
Expand All @@ -36,15 +37,15 @@ type TCPResolver func(network, address string) (*net.TCPAddr, error)

func NewSelector(name string, resolveUnixAddr UnixResolver, resolveTCPAddr TCPResolver) *Selector {
return &Selector{
name: name,
logger: log.With(util_log.Logger, "name", name),
resolveUnixAddr: resolveUnixAddr,
resolveTCPAddr: resolveTCPAddr,
}
}

func DefaultSelector(name string) *Selector {
return &Selector{
name: name,
logger: log.With(util_log.Logger, "name", name),
resolveUnixAddr: net.ResolveUnixAddr,
resolveTCPAddr: net.ResolveTCPAddr,
}
Expand Down Expand Up @@ -105,7 +106,7 @@ func (s *Selector) SetServers(servers ...string) error {
}
}

level.Debug(util_log.Logger).Log("msg", "updating servers", "name", s.name, "servers", strings.Join(addresses(naddrs), ","), "count", len(naddrs))
level.Debug(util_log.Logger).Log("msg", "updating servers", "servers", strings.Join(addresses(naddrs), ","), "count", len(naddrs))

s.mu.Lock()
defer s.mu.Unlock()
Expand Down

0 comments on commit 8321961

Please sign in to comment.