Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

rafthttp: move new funcs to right place

Browse Source
This commit is contained in:
Xiang Li 2015-10-17 22:34:48 -07:00
parent 478fab6aca
commit e87cd0c17b
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rafthttp/http.go
View File

@ -48,27 +48,10 @@ var (
errClusterIDMismatch = errors.New("cluster ID mismatch") errClusterIDMismatch = errors.New("cluster ID mismatch")
) )
func newSnapshotHandler(r Raft, snapSaver SnapshotSaver, cid types.ID) http.Handler {
return &snapshotHandler{
r: r,
snapSaver: snapSaver,
cid: cid,
}
}
type peerGetter interface { type peerGetter interface {
Get(id types.ID) Peer Get(id types.ID) Peer
} }
func newStreamHandler(peerGetter peerGetter, r Raft, id, cid types.ID) http.Handler {
return &streamHandler{
peerGetter: peerGetter,
r: r,
id: id,
cid: cid,
}
}
type writerToResponse interface { type writerToResponse interface {
WriteTo(w http.ResponseWriter) WriteTo(w http.ResponseWriter)
} }
@ -140,6 +123,14 @@ type snapshotHandler struct {
cid types.ID cid types.ID
} }
func newSnapshotHandler(r Raft, snapSaver SnapshotSaver, cid types.ID) http.Handler {
return &snapshotHandler{
r: r,
snapSaver: snapSaver,
cid: cid,
}
}
// ServeHTTP serves HTTP request to receive and process snapshot message. // ServeHTTP serves HTTP request to receive and process snapshot message.
// //
// If request sender dies without closing underlying TCP connection, // If request sender dies without closing underlying TCP connection,
@ -211,6 +202,15 @@ type streamHandler struct {
cid types.ID cid types.ID
} }
func newStreamHandler(peerGetter peerGetter, r Raft, id, cid types.ID) http.Handler {
return &streamHandler{
peerGetter: peerGetter,
r: r,
id: id,
cid: cid,
}
}
func (h *streamHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h *streamHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if r.Method != "GET" { if r.Method != "GET" {
w.Header().Set("Allow", "GET") w.Header().Set("Allow", "GET")