luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Make xDS labeling consistent with proxycfg

This commit is contained in:
freddygv 2021-02-05 15:15:52 -07:00
parent 57c29aba5d
commit 8de6b2590c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/xds/server.go
View File

@ -328,7 +328,7 @@ func (s *Server) process(stream ADSStream, reqCh <-chan *envoy.DiscoveryRequest)
defer watchCancel()
logger.Trace("watching proxy, pending initial proxycfg snapshot",
"proxy-id", proxyID.String())
"service_id", proxyID.String())
// Now wait for the config so we can check ACL
state = statePendingInitialConfig
@ -342,7 +342,7 @@ func (s *Server) process(stream ADSStream, reqCh <-chan *envoy.DiscoveryRequest)
state = stateRunning
logger.Trace("Got initial config snapshot",
"proxy-id", cfgSnap.ProxyID.String())
"service_id", cfgSnap.ProxyID.String())
// Lets actually process the config we just got or we'll mis responding
fallthrough
@ -356,7 +356,7 @@ func (s *Server) process(stream ADSStream, reqCh <-chan *envoy.DiscoveryRequest)
extendAuthTimer()
logger.Trace("Invoking all xDS resource handlers and sending new data if there is any",
"proxy-id", cfgSnap.ProxyID.String())
"service_id", cfgSnap.ProxyID.String())
// See if any handlers need to have the current (possibly new) config
// sent. Note the order here is actually significant so we can't just