dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Setup default logging before logging.

This commit is contained in:
Daniel Nelson 2019-07-29 21:47:49 -07:00
parent 5c7c9e40ee
commit 3f63c14179
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/telegraf/telegraf.go
View File

@ -136,19 +136,10 @@ func loadExternalPlugins(rootDir string) error {
return nil return nil
} }
// name will be the path to the plugin file beginning at the root
// directory, minus the extension.
// ie, if the plugin file is ./telegraf-plugins/foo.so, name
// will be "telegraf-plugins/foo"
name := strings.TrimPrefix(strings.TrimPrefix(pth, rootDir), string(os.PathSeparator))
name = strings.TrimSuffix(name, filepath.Ext(pth))
// Load plugin. // Load plugin.
_, err = plugin.Open(pth) _, err = plugin.Open(pth)
if err != nil { if err != nil {
errorMsg := fmt.Sprintf("error loading [%s]: %s", pth, err) return fmt.Errorf("error loading %s: %s", pth, err)
log.Printf(errorMsg)
return errors.New(errorMsg)
} }
return nil return nil
@ -161,7 +152,6 @@ func runAgent(ctx context.Context,
) error { ) error {
// Setup default logging. This may need to change after reading the config // Setup default logging. This may need to change after reading the config
// file, but we can configure it to use our logger implementation now. // file, but we can configure it to use our logger implementation now.
logger.SetupLogging(logger.LogConfig{})
log.Printf("I! Starting Telegraf %s", version) log.Printf("I! Starting Telegraf %s", version)
// If no other options are specified, load the config file and run. // If no other options are specified, load the config file and run.
@ -323,11 +313,13 @@ func main() {
processorFilters = strings.Split(":"+strings.TrimSpace(*fProcessorFilters)+":", ":") processorFilters = strings.Split(":"+strings.TrimSpace(*fProcessorFilters)+":", ":")
} }
logger.SetupLogging(logger.LogConfig{})
// Load external plugins, if requested. // Load external plugins, if requested.
if *fPlugins != "" { if *fPlugins != "" {
log.Printf("Loading external plugins from: %s\n", *fPlugins) log.Printf("I! Loading external plugins from: %s", *fPlugins)
if err := loadExternalPlugins(*fPlugins); err != nil { if err := loadExternalPlugins(*fPlugins); err != nil {
log.Fatal(err.Error()) log.Fatal("E! " + err.Error())
} }
} }