4 files changed, 61 insertions, 38 deletions

diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 3d4974535..59f1f95cb 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -83,10 +83,6 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
 		ConnectionCh: make(chan int),
 	}
 
-	server.Timer = time.AfterFunc(server.Duration, func() {
-		server.ConnectionCh <- NOOPHandler
-	})
-
 	router.NotFoundHandler = http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
 			// We can track user errors...
@@ -140,36 +136,15 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
 
 // Serve starts responding to HTTP requests
 func (s *APIServer) Serve() error {
-	// stalker to count the connections.  Should the timer expire it will shutdown the service.
-	go func() {
-		for delta := range s.ConnectionCh {
-			switch delta {
-			case EnterHandler:
-				s.Timer.Stop()
-				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)
-				}
-			case NOOPHandler:
-				// push the check out another duration...
-				s.Timer.Reset(s.Duration)
-			default:
-				logrus.Errorf("ConnectionCh received unsupported input %d", delta)
-			}
-		}
-	}()
+	// This is initialized here as Timer is not needed until Serve'ing
+	if s.Duration > 0 {
+		s.Timer = time.AfterFunc(s.Duration, func() {
+			s.ConnectionCh <- NOOPHandler
+		})
+		go s.ReadChannelWithTimeout()
+	} else {
+		go s.ReadChannelNoTimeout()
+	}
 
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
@@ -194,6 +169,53 @@ func (s *APIServer) Serve() error {
 	return nil
 }
 
+func (s *APIServer) ReadChannelWithTimeout() {
+	// stalker to count the connections.  Should the timer expire it will shutdown the service.
+	for delta := range s.ConnectionCh {
+		switch delta {
+		case EnterHandler:
+			s.Timer.Stop()
+			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)
+			}
+		case NOOPHandler:
+			// push the check out another duration...
+			s.Timer.Reset(s.Duration)
+		default:
+			logrus.Warnf("ConnectionCh received unsupported input %d", delta)
+		}
+	}
+}
+
+func (s *APIServer) ReadChannelNoTimeout() {
+	// stalker to count the connections.
+	for delta := range s.ConnectionCh {
+		switch delta {
+		case EnterHandler:
+			s.ActiveConnections += 1
+			s.TotalConnections += 1
+		case ExitHandler:
+			s.ActiveConnections -= 1
+		case NOOPHandler:
+		default:
+			logrus.Warnf("ConnectionCh received unsupported input %d", delta)
+		}
+	}
+}
+
 // Shutdown is a clean shutdown waiting on existing clients
 func (s *APIServer) Shutdown() error {
 	// Duration == 0 flags no auto-shutdown of the server
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go
index a4d065a14..5cd8f7e4f 100644
--- a/pkg/bindings/test/common_test.go
+++ b/pkg/bindings/test/common_test.go
@@ -152,7 +152,7 @@ func (b *bindingTest) startAPIService() *gexec.Session {
 	var (
 		cmd []string
 	)
-	cmd = append(cmd, "--log-level=debug", "system", "service", "--timeout=999999", b.sock)
+	cmd = append(cmd, "--log-level=debug", "system", "service", "--timeout=0", b.sock)
 	return b.runPodman(cmd)
 }
 
diff --git a/pkg/bindings/test/volumes_test.go b/pkg/bindings/test/volumes_test.go
index c8940d46e..b1a742c43 100644
--- a/pkg/bindings/test/volumes_test.go
+++ b/pkg/bindings/test/volumes_test.go
@@ -3,11 +3,12 @@ package test_bindings
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"time"
+
 	"github.com/containers/libpod/pkg/api/handlers"
 	"github.com/containers/libpod/pkg/bindings/containers"
 	"github.com/containers/libpod/pkg/bindings/volumes"
-	"net/http"
-	"time"
 
 	"github.com/containers/libpod/pkg/bindings"
 	. "github.com/onsi/ginkgo"
diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go
index 50aaaaa44..e88d010c5 100644
--- a/pkg/varlinkapi/system.go
+++ b/pkg/varlinkapi/system.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/containers/image/v5/pkg/sysregistriesv2"
-	"github.com/containers/libpod/cmd/podman/varlink"
+	iopodman "github.com/containers/libpod/cmd/podman/varlink"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/sirupsen/logrus"
 )