refactor(server): Remove ServerConfig struct

etcd.go

@@ -155,11 +155,7 @@ func main() {
 	ps.SetRaftServer(raftServer)
 
 	// Create client server.
-	sConfig := server.ServerConfig{
+	s := server.New(info.Name, info.EtcdURL, ps, registry, store, &mb)
-		Name:     info.Name,
-		URL:      info.EtcdURL,
-	}
-	s := server.New(sConfig, ps, registry, store, &mb)
 
 	if config.Trace() {
 		s.EnableTracing()
@@ -186,7 +182,7 @@ func main() {
 		log.Fatal(http.Serve(psListener, sHTTP))
 	}()
 
-	log.Infof("etcd server [name %s, listen on %s, advertised url %s]", s.Config.Name, sListener.Addr(), s.Config.URL)
+	log.Infof("etcd server [name %s, listen on %s, advertised url %s]", s.Name, sListener.Addr(), s.URL())
 	sHTTP := &ehttp.CORSHandler{s, corsInfo}
 	log.Fatal(http.Serve(sListener, sHTTP))
 }

server/server.go

@@ -21,14 +21,10 @@ import (
 	_ "github.com/coreos/etcd/store/v2"
 )
 
-type ServerConfig struct {
-	Name string
-	URL  string
-}
-
 // This is the default implementation of the Server interface.
 type Server struct {
-	Config         ServerConfig
+	Name       string
+	url        string
 	handler    http.Handler
 	peerServer *PeerServer
 	registry   *Registry
@@ -39,9 +35,10 @@ type Server struct {
 }
 
 // Creates a new Server.
-func New(sConfig ServerConfig, peerServer *PeerServer, registry *Registry, store store.Store, mb *metrics.Bucket) *Server {
+func New(name, url string, peerServer *PeerServer, registry *Registry, store store.Store, mb *metrics.Bucket) *Server {
 	s := &Server{
-		Config:         sConfig,
+		Name:       name,
+		url:        url,
 		store:      store,
 		registry:   registry,
 		peerServer: peerServer,
@@ -79,7 +76,7 @@ func (s *Server) Term() uint64 {
 
 // The server URL.
 func (s *Server) URL() string {
-	return s.Config.URL
+	return s.url
 }
 
 // Retrives the Peer URL for a given node name.
@@ -125,7 +122,7 @@ func (s *Server) installV2(r *mux.Router) {
 }
 
 func (s *Server) installMod(r *mux.Router) {
-	r.PathPrefix("/mod").Handler(http.StripPrefix("/mod", mod.HttpHandler(s.Config.URL)))
+	r.PathPrefix("/mod").Handler(http.StripPrefix("/mod", mod.HttpHandler(s.URL())))
 }
 
 func (s *Server) installDebug(r *mux.Router) {
@@ -157,7 +154,7 @@ func (s *Server) handleFunc(r *mux.Router, path string, f func(http.ResponseWrit
 	// Wrap the standard HandleFunc interface to pass in the server reference.
 	return r.HandleFunc(path, func(w http.ResponseWriter, req *http.Request) {
 		// Log request.
-		log.Debugf("[recv] %s %s %s [%s]", req.Method, s.Config.URL, req.URL.Path, req.RemoteAddr)
+		log.Debugf("[recv] %s %s %s [%s]", req.Method, s.URL(), req.URL.Path, req.RemoteAddr)
 
 		// Execute handler function and return error if necessary.
 		if err := f(w, req); err != nil {
@@ -280,7 +277,7 @@ func (s *Server) GetLeaderHandler(w http.ResponseWriter, req *http.Request) erro
 
 // Handler to return all the known peers in the current cluster.
 func (s *Server) GetPeersHandler(w http.ResponseWriter, req *http.Request) error {
-	peers := s.registry.ClientURLs(s.peerServer.RaftServer().Leader(), s.Config.Name)
+	peers := s.registry.ClientURLs(s.peerServer.RaftServer().Leader(), s.Name)
 	w.WriteHeader(http.StatusOK)
 	w.Write([]byte(strings.Join(peers, ", ")))
 	return nil

tests/server_utils.go

@@ -59,11 +59,7 @@ func RunServer(f func(*server.Server)) {
 	raftServer.SetHeartbeatTimeout(testHeartbeatTimeout)
 	ps.SetRaftServer(raftServer)
 
-	sConfig := server.ServerConfig{
+	s := server.New(testName, "http://"+testClientURL, ps, registry, store, nil)
-		Name: testName,
-		URL: "http://"+testClientURL,
-	}
-	s := server.New(sConfig, ps, registry, store, nil)
 	sListener, err := server.NewListener(testClientURL)
 	if err != nil {
 		panic(err)