CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(agent): Clean up watch goroutines (#15643)

This commit is contained in:
Joshua Powers 2024-07-22 13:17:24 -06:00 committed by GitHub
parent 6df20e255c
commit 58bc62932d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/telegraf/telegraf.go
View File

@ -154,7 +154,7 @@ func (t *Telegraf) reloadLoop() error {
if _, err := os.Stat(fConfig); err != nil { if _, err := os.Stat(fConfig); err != nil {
log.Printf("W! Cannot watch config %s: %s", fConfig, err) log.Printf("W! Cannot watch config %s: %s", fConfig, err)
} else { } else {
go t.watchLocalConfig(signals, fConfig) go t.watchLocalConfig(ctx, signals, fConfig)
} }
} }
} }
@ -166,7 +166,7 @@ func (t *Telegraf) reloadLoop() error {
} }
} }
if len(remoteConfigs) > 0 { if len(remoteConfigs) > 0 {
go t.watchRemoteConfigs(signals, t.configURLWatchInterval, remoteConfigs) go t.watchRemoteConfigs(ctx, signals, t.configURLWatchInterval, remoteConfigs)
} }
} }
go func() { go func() {
@ -196,7 +196,7 @@ func (t *Telegraf) reloadLoop() error {
return nil return nil
} }
func (t *Telegraf) watchLocalConfig(signals chan os.Signal, fConfig string) { func (t *Telegraf) watchLocalConfig(ctx context.Context, signals chan os.Signal, fConfig string) {
var mytomb tomb.Tomb var mytomb tomb.Tomb
var watcher watch.FileWatcher var watcher watch.FileWatcher
if t.watchConfig == "poll" { if t.watchConfig == "poll" {
@ -211,6 +211,9 @@ func (t *Telegraf) watchLocalConfig(signals chan os.Signal, fConfig string) {
} }
log.Printf("I! Config watcher started for %s\n", fConfig) log.Printf("I! Config watcher started for %s\n", fConfig)
select { select {
case <-ctx.Done():
mytomb.Done()
return
case <-changes.Modified: case <-changes.Modified:
log.Printf("I! Config file %q modified\n", fConfig) log.Printf("I! Config file %q modified\n", fConfig)
case <-changes.Deleted: case <-changes.Deleted:
@ -236,7 +239,7 @@ func (t *Telegraf) watchLocalConfig(signals chan os.Signal, fConfig string) {
signals <- syscall.SIGHUP signals <- syscall.SIGHUP
} }
func (t *Telegraf) watchRemoteConfigs(signals chan os.Signal, interval time.Duration, remoteConfigs []string) { func (t *Telegraf) watchRemoteConfigs(ctx context.Context, signals chan os.Signal, interval time.Duration, remoteConfigs []string) {
configs := strings.Join(remoteConfigs, ", ") configs := strings.Join(remoteConfigs, ", ")
log.Printf("I! Remote config watcher started for: %s\n", configs) log.Printf("I! Remote config watcher started for: %s\n", configs)
@ -246,6 +249,8 @@ func (t *Telegraf) watchRemoteConfigs(signals chan os.Signal, interval time.Dura
lastModified := make(map[string]string, len(remoteConfigs)) lastModified := make(map[string]string, len(remoteConfigs))
for { for {
select { select {
case <-ctx.Done():
return
case <-signals: case <-signals:
return return
case <-ticker.C: case <-ticker.C: