Browse Source

agent/proxycfg: fix dropped error in state.initWatchesMeshGateway() (#7267)

pull/6833/head
Lars Lehtonen 5 years ago committed by GitHub
parent
commit
6bcd596539
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      agent/proxycfg/state.go

6
agent/proxycfg/state.go

@ -292,6 +292,9 @@ func (s *state) initWatchesConnectProxy() error {
Connect: true,
Source: *s.source,
}, "upstream:"+u.Identifier(), s.ch)
if err != nil {
return err
}
case structs.UpstreamDestTypeService:
fallthrough
@ -370,6 +373,9 @@ func (s *state) initWatchesMeshGateway() error {
err = s.cache.Notify(s.ctx, cachetype.CatalogDatacentersName, &structs.DatacentersRequest{
QueryOptions: structs.QueryOptions{Token: s.token, MaxAge: 30 * time.Second},
}, datacentersWatchID, s.ch)
if err != nil {
return err
}
// Once we start getting notified about the datacenters we will setup watches on the
// gateways within those other datacenters. We cannot do that here because we don't

Loading…
Cancel
Save