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

chore(agent): Print config filename in messages for clarity (#15642)

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

16
cmd/telegraf/telegraf.go
View File

@ -206,30 +206,30 @@ func (t *Telegraf) watchLocalConfig(signals chan os.Signal, fConfig string) {
} }
changes, err := watcher.ChangeEvents(&mytomb, 0) changes, err := watcher.ChangeEvents(&mytomb, 0)
if err != nil { if err != nil {
log.Printf("E! Error watching config: %s\n", err) log.Printf("E! Error watching config %q: %s\n", fConfig, err)
return return
} }
log.Printf("I! Config watcher started for %s\n", fConfig) log.Printf("I! Config watcher started for %s\n", fConfig)
select { select {
case <-changes.Modified: case <-changes.Modified:
log.Println("I! Config file modified") log.Printf("I! Config file %q modified\n", fConfig)
case <-changes.Deleted: case <-changes.Deleted:
// deleted can mean moved. wait a bit a check existence // deleted can mean moved. wait a bit a check existence
<-time.After(time.Second) <-time.After(time.Second)
if _, err := os.Stat(fConfig); err == nil { if _, err := os.Stat(fConfig); err == nil {
log.Println("I! Config file overwritten") log.Printf("I! Config file %q overwritten\n", fConfig)
} else { } else {
log.Println("W! Config file deleted") log.Printf("W! Config file %q deleted\n", fConfig)
if err := watcher.BlockUntilExists(&mytomb); err != nil { if err := watcher.BlockUntilExists(&mytomb); err != nil {
log.Printf("E! Cannot watch for config: %s\n", err.Error()) log.Printf("E! Cannot watch for config %q: %s\n", fConfig, err.Error())
return return
} }
log.Println("I! Config file appeared") log.Printf("I! Config file %q appeared\n", fConfig)
} }
case <-changes.Truncated: case <-changes.Truncated:
log.Println("I! Config file truncated") log.Printf("I! Config file %q truncated\n", fConfig)
case <-mytomb.Dying(): case <-mytomb.Dying():
log.Println("I! Config watcher ended") log.Printf("I! Config watcher %q ended\n", fConfig)
return return
} }
mytomb.Done() mytomb.Done()