merge conflict

cmd/influxd/config_test.go

@@ -181,6 +181,25 @@ port = 2005
 database = "graphite_udp"  # store graphite data in this database
 
 
+# Configure the graphite api
+[[graphite]]
+protocol = "TCP"
+enabled = true
+address = "192.168.0.1"
+port = 2003
+database = "graphite_tcp"  # store graphite data in this database
+
+[[graphite]]
+protocol = "udP"
+enabled = true
+address = "192.168.0.2"
+port = 2005
+database = "graphite_udp"  # store graphite data in this database
+
+
+# Raft configuration
+[raft]
+# The raft port should be open between all servers in a cluster.
 # Broker configuration
 [broker]
 # The broker port should be open between all servers in a cluster.

cmd/influxd/run.go

@@ -140,7 +140,7 @@ func openBroker(path, addr string) *messaging.Broker {
 func openServer(path string) *influxdb.Server {
 	s := influxdb.NewServer()
 	if err := s.Open(path); err != nil {
-		log.Fatalf("failed to open data server", err.Error())
+		log.Fatalf("failed to open data server: %v", err.Error())
 					log.Fatalf("seed server %v", err)
 	}
 	return s
@@ -153,7 +153,7 @@ func initServer(s *influxdb.Server, b *messaging.Broker) {
 
 	// Create replica on broker.
 	if err := b.CreateReplica(1); err != nil {
-		log.Fatalf("replica creation error: %d", err)
+		log.Fatalf("replica creation error: %s", err)
 	}
 
 	// Initialize messaging client.