Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix config file loading to read from a file 

Accidentally used `FromToml()` when trying to read from a file path
rather than `FromTomlFile()` which will read the file and then call
`FromToml()`.

Fixes #6578.
pull/6580/head
Jonathan A. Sternberg 2016-05-08 08:59:35 -04:00
parent b39995be91
commit 5a6a34144e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/influxd/run/command.go
View File

@ -200,7 +200,7 @@ func (cmd *Command) ParseConfig(path string) (*Config, error) {
log.Printf("Using configuration at: %s\n", path)
config := NewConfig()
if err := config.FromToml(path); err != nil {
if err := config.FromTomlFile(path); err != nil {
return nil, err
}

2
cmd/influxd/run/config_command.go
View File

@ -66,7 +66,7 @@ func (cmd *PrintConfigCommand) parseConfig(path string) (*Config, error) {
}
config := NewConfig()
if err := config.FromToml(path); err != nil {
if err := config.FromTomlFile(path); err != nil {
return nil, err
}
return config, nil