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

refactor remove the extra function

Browse Source
This commit is contained in:
Xiang Li
2013-10-13 22:13:20 -07:00
parent 2b291aabea
commit a635f6b17c
4 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/server.go
View File

@@ -207,7 +207,7 @@ func (s *Server) Dispatch(c raft.Command, w http.ResponseWriter, req *http.Reque
case *JoinCommand, *RemoveCommand:
url, _ = s.registry.PeerURL(leader)
default:
url, _ = s.registry.URL(leader)
url, _ = s.registry.ClientURL(leader)
}
redirect(url, w, req)
@@ -258,7 +258,7 @@ func (s *Server) GetLeaderHandler(w http.ResponseWriter, req *http.Request) erro
// Handler to return all the known machines in the current cluster.
func (s *Server) GetMachinesHandler(w http.ResponseWriter, req *http.Request) error {
machines := s.registry.URLs(s.peerServer.Leader(), s.name)
machines := s.registry.URLs(s.peerServer.Leader(), s.name, s.registry.clientURL)
w.WriteHeader(http.StatusOK)
w.Write([]byte(strings.Join(machines, ", ")))
return nil
@@ -281,7 +281,7 @@ func (s *Server) GetLeaderStatsHandler(w http.ResponseWriter, req *http.Request)
if leader == "" {
return etcdErr.NewError(300, "", store.UndefIndex, store.UndefTerm)
}
hostname, _ := s.registry.URL(leader)
hostname, _ := s.registry.ClientURL(leader)
redirect(hostname, w, req)
return nil
}