Browse Source

rafthttp: rename NewHandler to newPipelineHandler

Xiang Li 10 years ago
parent
commit
478fab6aca
3 changed files with 16 additions and 11 deletions
  1. 14 9
      rafthttp/http.go
  2. 1 1
      rafthttp/http_test.go
  3. 1 1
      rafthttp/transport.go

+ 14 - 9
rafthttp/http.go

@@ -48,13 +48,6 @@ var (
 	errClusterIDMismatch   = errors.New("cluster ID mismatch")
 	errClusterIDMismatch   = errors.New("cluster ID mismatch")
 )
 )
 
 
-func NewHandler(r Raft, cid types.ID) http.Handler {
-	return &handler{
-		r:   r,
-		cid: cid,
-	}
-}
-
 func newSnapshotHandler(r Raft, snapSaver SnapshotSaver, cid types.ID) http.Handler {
 func newSnapshotHandler(r Raft, snapSaver SnapshotSaver, cid types.ID) http.Handler {
 	return &snapshotHandler{
 	return &snapshotHandler{
 		r:         r,
 		r:         r,
@@ -80,12 +73,24 @@ type writerToResponse interface {
 	WriteTo(w http.ResponseWriter)
 	WriteTo(w http.ResponseWriter)
 }
 }
 
 
-type handler struct {
+type pipelineHandler struct {
 	r   Raft
 	r   Raft
 	cid types.ID
 	cid types.ID
 }
 }
 
 
-func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+// newPipelineHandler returns a handler for handling raft messages 
+// from pipeline for RaftPrefix.
+//
+// The handler reads out the raft message from request body,
+// and forwards it to the given raft state machine for processing.
+func newPipelineHandler(r Raft, cid types.ID) http.Handler {
+	return &pipelineHandler{
+		r:   r,
+		cid: cid,
+	}
+}
+
+func (h *pipelineHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Method != "POST" {
 	if r.Method != "POST" {
 		w.Header().Set("Allow", "POST")
 		w.Header().Set("Allow", "POST")
 		http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
 		http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)

+ 1 - 1
rafthttp/http_test.go

@@ -149,7 +149,7 @@ func TestServeRaftPrefix(t *testing.T) {
 		req.Header.Set("X-Etcd-Cluster-ID", tt.clusterID)
 		req.Header.Set("X-Etcd-Cluster-ID", tt.clusterID)
 		req.Header.Set("X-Server-Version", version.Version)
 		req.Header.Set("X-Server-Version", version.Version)
 		rw := httptest.NewRecorder()
 		rw := httptest.NewRecorder()
-		h := NewHandler(tt.p, types.ID(0))
+		h := newPipelineHandler(tt.p, types.ID(0))
 		h.ServeHTTP(rw, req)
 		h.ServeHTTP(rw, req)
 		if rw.Code != tt.wcode {
 		if rw.Code != tt.wcode {
 			t.Errorf("#%d: got code=%d, want %d", i, rw.Code, tt.wcode)
 			t.Errorf("#%d: got code=%d, want %d", i, rw.Code, tt.wcode)

+ 1 - 1
rafthttp/transport.go

@@ -152,7 +152,7 @@ func (t *Transport) Start() error {
 }
 }
 
 
 func (t *Transport) Handler() http.Handler {
 func (t *Transport) Handler() http.Handler {
-	pipelineHandler := NewHandler(t.Raft, t.ClusterID)
+	pipelineHandler := newPipelineHandler(t.Raft, t.ClusterID)
 	streamHandler := newStreamHandler(t, t.Raft, t.ID, t.ClusterID)
 	streamHandler := newStreamHandler(t, t.Raft, t.ID, t.ClusterID)
 	snapHandler := newSnapshotHandler(t.Raft, t.SnapSaver, t.ClusterID)
 	snapHandler := newSnapshotHandler(t.Raft, t.SnapSaver, t.ClusterID)
 	mux := http.NewServeMux()
 	mux := http.NewServeMux()