status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update proxycfg logging, labels were already attached

This commit is contained in:
freddygv 2021-02-05 15:14:49 -07:00
parent 5ba14ad41d
commit 95e7641faa
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
agent/proxycfg/state.go
View File

@ -583,8 +583,6 @@ func (s *state) initialConfigSnapshot() ConfigSnapshot {
} }
func (s *state) run() { func (s *state) run() {
logger := s.logger.Named(logging.ProxyConfig)
// Close the channel we return from Watch when we stop so consumers can stop // Close the channel we return from Watch when we stop so consumers can stop
// watching and clean up their goroutines. It's important we do this here and // watching and clean up their goroutines. It's important we do this here and
// not in Close since this routine sends on this chan and so might panic if it // not in Close since this routine sends on this chan and so might panic if it
@ -605,12 +603,10 @@ func (s *state) run() {
case <-s.ctx.Done(): case <-s.ctx.Done():
return return
case u := <-s.ch: case u := <-s.ch:
logger.Trace("A blocking query returned; handling snapshot update", s.logger.Trace("A blocking query returned; handling snapshot update")
"proxy-id", s.proxyID.String(),
)
if err := s.handleUpdate(u, &snap); err != nil { if err := s.handleUpdate(u, &snap); err != nil {
logger.Error("Failed to handle update from watch", s.logger.Error("Failed to handle update from watch",
"id", u.CorrelationID, "error", err, "id", u.CorrelationID, "error", err,
) )
continue continue
@ -621,8 +617,8 @@ func (s *state) run() {
// etc on future updates. // etc on future updates.
snapCopy, err := snap.Clone() snapCopy, err := snap.Clone()
if err != nil { if err != nil {
logger.Error("Failed to copy config snapshot for proxy", s.logger.Error("Failed to copy config snapshot for proxy",
"proxy-id", s.proxyID.String(), "error", err, "error", err,
) )
continue continue
} }
@ -630,15 +626,11 @@ func (s *state) run() {
select { select {
// try to send // try to send
case s.snapCh <- *snapCopy: case s.snapCh <- *snapCopy:
logger.Trace("Delivered new snapshot to proxy config watchers", s.logger.Trace("Delivered new snapshot to proxy config watchers")
"proxy-id", s.proxyID.String(),
)
// avoid blocking if a snapshot is already buffered // avoid blocking if a snapshot is already buffered
default: default:
logger.Trace("Failed to deliver new snapshot to proxy config watchers", s.logger.Trace("Failed to deliver new snapshot to proxy config watchers")
"proxy-id", s.proxyID.String(),
)
} }
// Allow the next change to trigger a send // Allow the next change to trigger a send
@ -649,25 +641,21 @@ func (s *state) run() {
continue continue
case replyCh := <-s.reqCh: case replyCh := <-s.reqCh:
logger.Trace("A proxy config snapshot was requested", s.logger.Trace("A proxy config snapshot was requested")
"proxy-id", s.proxyID.String(),
)
if !snap.Valid() { if !snap.Valid() {
// Not valid yet just respond with nil and move on to next task. // Not valid yet just respond with nil and move on to next task.
replyCh <- nil replyCh <- nil
logger.Trace("The proxy's config snapshot is not valid yet", s.logger.Trace("The proxy's config snapshot is not valid yet")
"proxy-id", s.proxyID.String(),
)
continue continue
} }
// Make a deep copy of snap so we don't mutate any of the embedded structs // Make a deep copy of snap so we don't mutate any of the embedded structs
// etc on future updates. // etc on future updates.
snapCopy, err := snap.Clone() snapCopy, err := snap.Clone()
if err != nil { if err != nil {
logger.Error("Failed to copy config snapshot for proxy", s.logger.Error("Failed to copy config snapshot for proxy",
"proxy-id", s.proxyID.String(), "error", err, "error", err,
) )
continue continue
} }