Merge pull request influxdata#6580 from influxdata/js-config-file-opt…

…ion-fix Fix config file loading to read from a file
oldmantaiter · May 9, 2016 · 4748bb1 · 4748bb1
2 parents b39995b + 5a6a341
commit 4748bb1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/influxd/run/command.go b/cmd/influxd/run/command.go
@@ -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
 	}
 

diff --git a/cmd/influxd/run/config_command.go b/cmd/influxd/run/config_command.go
@@ -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