Remove 1 sec delay

 * Stop closing net.Listener() twice on interrupt
 * Do not report error if closing server twice

Fixes #5311

Signed-off-by: Jhon Honce <jhonce@redhat.com>

2 files changed, 22 insertions, 28 deletions

diff --git a/cmd/podman/service.go b/cmd/podman/service.go
index 3e0ff927f..7606e3009 100644
--- a/cmd/podman/service.go
+++ b/cmd/podman/service.go
@@ -143,7 +143,6 @@ func runREST(r *libpod.Runtime, uri string, timeout time.Duration) error {
 		if err != nil {
 			return errors.Wrapf(err, "unable to create socket %s", uri)
 		}
-		defer l.Close()
 		listener = &l
 	}
 	server, err := api.NewServerWithSettings(r, timeout, listener)
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index e7b2a5525..a5922e5d7 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -140,36 +140,31 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
 func (s *APIServer) Serve() error {
 	// stalker to count the connections.  Should the timer expire it will shutdown the service.
 	go func() {
-		for {
-			select {
-			case delta := <-s.ConnectionCh:
-				// Always stop the current timer, things will change...
+		for delta := range s.ConnectionCh {
+			switch delta {
+			case EnterHandler:
 				s.Timer.Stop()
-				switch delta {
-				case EnterHandler:
-					s.ActiveConnections += 1
-					s.TotalConnections += 1
-				case ExitHandler:
-					s.ActiveConnections -= 1
-					if s.ActiveConnections == 0 {
-						// Server will be shutdown iff the timer expires before being reset or stopped
-						s.Timer = time.AfterFunc(s.Duration, func() {
-							if err := s.Shutdown(); err != nil {
-								logrus.Errorf("Failed to shutdown APIServer: %v", err)
-								os.Exit(1)
-							}
-						})
-					} else {
-						s.Timer.Reset(s.Duration)
-					}
-				case NOOPHandler:
-					// push the check out another duration...
+				s.ActiveConnections += 1
+				s.TotalConnections += 1
+			case ExitHandler:
+				s.Timer.Stop()
+				s.ActiveConnections -= 1
+				if s.ActiveConnections == 0 {
+					// Server will be shutdown iff the timer expires before being reset or stopped
+					s.Timer = time.AfterFunc(s.Duration, func() {
+						if err := s.Shutdown(); err != nil {
+							logrus.Errorf("Failed to shutdown APIServer: %v", err)
+							os.Exit(1)
+						}
+					})
+				} else {
 					s.Timer.Reset(s.Duration)
-				default:
-					logrus.Errorf("ConnectionCh received unsupported input %d", delta)
 				}
+			case NOOPHandler:
+				// push the check out another duration...
+				s.Timer.Reset(s.Duration)
 			default:
-				time.Sleep(1 * time.Second)
+				logrus.Errorf("ConnectionCh received unsupported input %d", delta)
 			}
 		}
 	}()
@@ -212,7 +207,7 @@ func (s *APIServer) Shutdown() error {
 
 	go func() {
 		err := s.Server.Shutdown(ctx)
-		if err != nil && err != context.Canceled {
+		if err != nil && err != context.Canceled && err != http.ErrServerClosed {
 			logrus.Errorf("Failed to cleanly shutdown APIServer: %s", err.Error())
 		}
 	}()