mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(servers): emit http.Handlers from *Server

Browse Source
This commit is contained in:
Brian Waldon
2014-01-21 08:08:20 -08:00
parent 089021ca6d
commit 2fe22f1890
4 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/peer_server.go
View File

@ -35,7 +35,6 @@ type PeerServerConfig struct {
type PeerServer struct {
Config PeerServerConfig
handler http.Handler
raftServer raft.Server
server *Server
joinIndex uint64
@ -77,8 +76,6 @@ func NewPeerServer(psConfig PeerServerConfig, registry *Registry, store store.St
metrics: mb,
}
s.handler = s.buildHTTPHandler()
return s
}
@ -164,7 +161,7 @@ func (s *PeerServer) Stop() {
}
}
func (s *PeerServer) buildHTTPHandler() http.Handler {
func (s *PeerServer) HTTPHandler() http.Handler {
router := mux.NewRouter()
// internal commands
@ -184,10 +181,6 @@ func (s *PeerServer) buildHTTPHandler() http.Handler {
return router
}
func (s *PeerServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
s.handler.ServeHTTP(w, r)
}
// Retrieves the underlying Raft server.
func (s *PeerServer) RaftServer() raft.Server {
return s.raftServer