Xiang Li 12 years ago
parent
commit
fad972304c
3 changed files with 6 additions and 9 deletions
  1. 1 3
      etcd.go
  2. 2 2
      handlers.go
  3. 3 4
      transporter.go

+ 1 - 3
etcd.go

@@ -176,7 +176,7 @@ func main() {
 		fmt.Println(err)
 		debug("%s bad snapshot", raftServer.Name())
 	}
-	
+
 	raftServer.Initialize()
 	debug("%s finished init", raftServer.Name())
 	raftServer.SetElectionTimeout(ELECTIONTIMTOUT)
@@ -234,8 +234,6 @@ func main() {
 
 }
 
-
-
 func createTransporter(st int) transporter {
 	t := transporter{}
 

+ 2 - 2
handlers.go

@@ -38,7 +38,7 @@ func VoteHttpHandler(w http.ResponseWriter, req *http.Request) {
 func AppendEntriesHttpHandler(w http.ResponseWriter, req *http.Request) {
 	aereq := &raft.AppendEntriesRequest{}
 	err := decodeJsonRequest(req, aereq)
-	
+
 	if err == nil {
 		debug("[recv] POST http://%s/log/append [%d]", raftServer.Name(), len(aereq.Entries))
 		if resp := raftServer.AppendEntries(aereq); resp != nil {
@@ -77,7 +77,7 @@ func clientHttpHandler(w http.ResponseWriter, req *http.Request) {
 	w.Write([]byte(client))
 }
 
-// 
+//
 func JoinHttpHandler(w http.ResponseWriter, req *http.Request) {
 
 	command := &JoinCommand{}

+ 3 - 4
transporter.go

@@ -4,15 +4,15 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"github.com/coreos/go-raft"
 	"io"
+	"io/ioutil"
 	"net/http"
 )
 
 // Transporter layer for communication between raft nodes
 type transporter struct {
-	name   string
+	name string
 	// If https is used for server internal communcation,
 	// we will have a http client. Or it will be nil.
 	client *http.Client
@@ -84,7 +84,7 @@ func (t transporter) SendSnapshotRequest(server *raft.Server, peer *raft.Peer, r
 
 // Get the the client address of the leader in the cluster
 func (t transporter) GetLeaderClientAddress() string {
-	resp, _ := t.Get(raftServer.Leader()+"/client")
+	resp, _ := t.Get(raftServer.Leader() + "/client")
 	if resp != nil {
 		body, _ := ioutil.ReadAll(resp.Body)
 		resp.Body.Close()
@@ -105,7 +105,6 @@ func (t transporter) Post(path string, body io.Reader) (*http.Response, error) {
 	}
 }
 
-
 // Send server side GET request
 func (t transporter) Get(path string) (*http.Response, error) {
 	if t.client != nil {