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

Merge pull request #1987 from influxdb/print-default-config 

Fix config print startup statement for when no config is provided
pull/1990/head
Cory LaNou 2015-03-17 08:47:24 -06:00
parent 76f432182a 4ccd692daf
commit 6ecf084c89
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@
- [#1971](https://github.com/influxdb/influxdb/pull/1971): Fix leader id initialization. - [#1971](https://github.com/influxdb/influxdb/pull/1971): Fix leader id initialization.
- [#1975](https://github.com/influxdb/influxdb/pull/1975): Require `q` parameter for query endpoint. - [#1975](https://github.com/influxdb/influxdb/pull/1975): Require `q` parameter for query endpoint.
- [#1969](https://github.com/influxdb/influxdb/pull/1969): Print loaded config. - [#1969](https://github.com/influxdb/influxdb/pull/1969): Print loaded config.
- [#1987](https://github.com/influxdb/influxdb/pull/1987): Fix config print startup statement for when no config is provided.
## v0.9.0-rc12 [2015-03-15] ## v0.9.0-rc12 [2015-03-15]

2
cmd/influxd/main.go
View File

@ -104,7 +104,7 @@ func execRun(args []string) {
log.SetFlags(log.LstdFlags) log.SetFlags(log.LstdFlags)
writePIDFile(*pidPath) writePIDFile(*pidPath)
if configPath != nil { if *configPath == "" {
log.Println("No config provided, using default settings") log.Println("No config provided, using default settings")
} }
config := parseConfig(*configPath, *hostname) config := parseConfig(*configPath, *hostname)