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

Merge branch 'master' of https://github.com/influxdb/influxdb into group-by

pull/1247/head
Ben Johnson 2014-12-19 11:19:08 -07:00
parent 41bb5ccfdd 3d2e57421d
commit 1ad79470c6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/influxd/join_cluster.go
View File

@ -93,7 +93,7 @@ join-cluster creates a completely new node that will attempt to join an existing
'combined' means it will do both. The default is 'combined'. In role other than 'combined' means it will do both. The default is 'combined'. In role other than
these three is invalid. these three is invalid.
-seedservers <servers> -seed-servers <servers>
Set the list of servers the node should contact, to join the cluster. This Set the list of servers the node should contact, to join the cluster. This
should be comma-delimited list of servers, in the form host:port. This option should be comma-delimited list of servers, in the form host:port. This option
is REQUIRED. is REQUIRED.

8
cmd/influxd/run.go
View File

@ -130,14 +130,14 @@ func execRun(args []string) {
// Start up HTTP server(s) // Start up HTTP server(s)
if config.ApiHTTPListenAddr() != config.RaftListenAddr() { if config.ApiHTTPListenAddr() != config.RaftListenAddr() {
if serverHandler != nil { if serverHandler != nil {
func() { log.Fatal(http.ListenAndServe(config.ApiHTTPListenAddr(), serverHandler)) }() go func() { log.Fatal(http.ListenAndServe(config.ApiHTTPListenAddr(), serverHandler)) }()
} }
if brokerHandler != nil { if brokerHandler != nil {
func() { log.Fatal(http.ListenAndServe(config.RaftListenAddr(), brokerHandler)) }() go func() { log.Fatal(http.ListenAndServe(config.RaftListenAddr(), brokerHandler)) }()
} }
} else { } else {
h := NewHandler(brokerHandler, serverHandler) h := NewHandler(brokerHandler, serverHandler)
func() { log.Fatal(http.ListenAndServe(config.ApiHTTPListenAddr(), h)) }() go func() { log.Fatal(http.ListenAndServe(config.ApiHTTPListenAddr(), h)) }()
} }
// Wait indefinitely. // Wait indefinitely.
@ -157,7 +157,7 @@ use Distributed Consensus, but is otherwise fully-functional.
-hostname <name> -hostname <name>
Override the hostname, the 'hostname' configuration option will be overridden. Override the hostname, the 'hostname' configuration option will be overridden.
-seedservers <servers> -seed-servers <servers>
If joining a cluster, overrides any previously configured or discovered If joining a cluster, overrides any previously configured or discovered
Data node seed servers. Data node seed servers.

2
raft/log.go
View File

@ -377,7 +377,7 @@ func (l *Log) readConfig() (*Config, error) {
// Marshal file to a config type. // Marshal file to a config type.
var config *Config var config *Config
if f != nil { if f != nil {
config := &Config{} config = &Config{}
if err := NewConfigDecoder(f).Decode(config); err != nil { if err := NewConfigDecoder(f).Decode(config); err != nil {
return nil, err return nil, err
} }