Merge pull request #45088 from corhere/make-apiserver-less-weird

api/server: delete Wait method

1 files changed, 2 insertions, 15 deletions

diff --git a/api/server/server.go b/api/server/server.go
index 3ce2659287..397323793e 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -57,9 +57,8 @@ func (s *Server) Close() {
 	}
 }
 
-// serveAPI loops through all initialized servers and spawns goroutine
-// with Serve method for each. It sets createMux() as Handler also.
-func (s *Server) serveAPI() error {
+// Serve starts listening for inbound requests.
+func (s *Server) Serve() error {
 	var chErrors = make(chan error, len(s.servers))
 	for _, srv := range s.servers {
 		srv.srv.Handler = s.createMux()
@@ -174,15 +173,3 @@ func (s *Server) createMux() *mux.Router {
 
 	return m
 }
-
-// Wait blocks the server goroutine until it exits.
-// It sends an error message if there is any error during
-// the API execution.
-func (s *Server) Wait(waitChan chan error) {
-	if err := s.serveAPI(); err != nil {
-		logrus.Errorf("ServeAPI error: %v", err)
-		waitChan <- err
-		return
-	}
-	waitChan <- nil
-}