mirror of
https://github.com/prometheus/prometheus.git
synced 2025-03-05 20:59:13 -08:00
Merge b73c524ffa
into 61aa82865d
This commit is contained in:
commit
bfc516d2f8
|
@ -350,8 +350,10 @@ func (m *Manager) updater(ctx context.Context, p *Provider, updates chan []*targ
|
||||||
|
|
||||||
func (m *Manager) sender() {
|
func (m *Manager) sender() {
|
||||||
ticker := time.NewTicker(m.updatert)
|
ticker := time.NewTicker(m.updatert)
|
||||||
defer ticker.Stop()
|
defer func() {
|
||||||
|
ticker.Stop()
|
||||||
|
close(m.syncCh)
|
||||||
|
}()
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-m.ctx.Done():
|
case <-m.ctx.Done():
|
||||||
|
|
|
@ -380,7 +380,10 @@ func (n *Manager) targetUpdateLoop(tsets <-chan map[string][]*targetgroup.Group)
|
||||||
select {
|
select {
|
||||||
case <-n.stopRequested:
|
case <-n.stopRequested:
|
||||||
return
|
return
|
||||||
case ts := <-tsets:
|
case ts, ok := <-tsets:
|
||||||
|
if !ok {
|
||||||
|
break
|
||||||
|
}
|
||||||
n.reload(ts)
|
n.reload(ts)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -122,7 +122,10 @@ func (m *Manager) Run(tsets <-chan map[string][]*targetgroup.Group) error {
|
||||||
go m.reloader()
|
go m.reloader()
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case ts := <-tsets:
|
case ts, ok := <-tsets:
|
||||||
|
if !ok {
|
||||||
|
break
|
||||||
|
}
|
||||||
m.updateTsets(ts)
|
m.updateTsets(ts)
|
||||||
|
|
||||||
select {
|
select {
|
||||||
|
|
Loading…
Reference in a new issue