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

fix(agent): Only read the config once (#12607)

This commit is contained in:
Joshua Powers 2023-02-06 02:05:59 -07:00 committed by GitHub
parent 257083dba8
commit 31a87df2ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/telegraf/telegraf.go
View File

@ -111,7 +111,7 @@ func (t *Telegraf) GetSecretStore(id string) (telegraf.SecretStore, error) {
} }
func (t *Telegraf) reloadLoop() error { func (t *Telegraf) reloadLoop() error {
_, err := t.loadConfiguration() cfg, err := t.loadConfiguration()
if err != nil { if err != nil {
return err return err
} }
@ -151,7 +151,7 @@ func (t *Telegraf) reloadLoop() error {
} }
}() }()
err := t.runAgent(ctx) err := t.runAgent(ctx, cfg)
if err != nil && err != context.Canceled { if err != nil && err != context.Canceled {
return fmt.Errorf("[telegraf] Error running agent: %v", err) return fmt.Errorf("[telegraf] Error running agent: %v", err)
} }
@ -230,12 +230,7 @@ func (t *Telegraf) loadConfiguration() (*config.Config, error) {
return c, nil return c, nil
} }
func (t *Telegraf) runAgent(ctx context.Context) error { func (t *Telegraf) runAgent(ctx context.Context, c *config.Config) error {
c, err := t.loadConfiguration()
if err != nil {
return err
}
if !(t.test || t.testWait != 0) && len(c.Outputs) == 0 { if !(t.test || t.testWait != 0) && len(c.Outputs) == 0 {
return errors.New("no outputs found, did you provide a valid config file?") return errors.New("no outputs found, did you provide a valid config file?")
} }