Merge pull request #7833 from jwhonce/issues/7826

Refactor IdleTracker to handle StateIdle transitions

1 files changed, 11 insertions, 11 deletions

diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index e7c031234..09a9f6370 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/containers/podman/v2/libpod"
 	"github.com/containers/podman/v2/pkg/api/handlers"
-	"github.com/containers/podman/v2/pkg/api/server/idletracker"
+	"github.com/containers/podman/v2/pkg/api/server/idle"
 	"github.com/coreos/go-systemd/v22/activation"
 	"github.com/coreos/go-systemd/v22/daemon"
 	"github.com/gorilla/mux"
@@ -26,14 +26,14 @@ import (
 )
 
 type APIServer struct {
-	http.Server                                 // The  HTTP work happens here
-	*schema.Decoder                             // Decoder for Query parameters to structs
-	context.Context                             // Context to carry objects to handlers
-	*libpod.Runtime                             // Where the real work happens
-	net.Listener                                // mux for routing HTTP API calls to libpod routines
-	context.CancelFunc                          // Stop APIServer
-	idleTracker        *idletracker.IdleTracker // Track connections to support idle shutdown
-	pprof              *http.Server             // Sidecar http server for providing performance data
+	http.Server                      // The  HTTP work happens here
+	*schema.Decoder                  // Decoder for Query parameters to structs
+	context.Context                  // Context to carry objects to handlers
+	*libpod.Runtime                  // Where the real work happens
+	net.Listener                     // mux for routing HTTP API calls to libpod routines
+	context.CancelFunc               // Stop APIServer
+	idleTracker        *idle.Tracker // Track connections to support idle shutdown
+	pprof              *http.Server  // Sidecar http server for providing performance data
 }
 
 // Number of seconds to wait for next request, if exceeded shutdown server
@@ -70,13 +70,13 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
 	}
 
 	router := mux.NewRouter().UseEncodedPath()
-	idle := idletracker.NewIdleTracker(duration)
+	idle := idle.NewTracker(duration)
 
 	server := APIServer{
 		Server: http.Server{
 			Handler:           router,
 			ReadHeaderTimeout: 20 * time.Second,
-			IdleTimeout:       duration,
+			IdleTimeout:       duration * 2,
 			ConnState:         idle.ConnState,
 			ErrorLog:          log.New(logrus.StandardLogger().Out, "", 0),
 		},