summaryrefslogtreecommitdiff
path: root/pkg/api
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-04-20 10:42:00 -0400
committerGitHub <noreply@github.com>2020-04-20 10:42:00 -0400
commite5e625b2a6481dd49d1d6303df1157c8a51dd7c2 (patch)
treeaf3212ad2ddcf805ff2f38a9e63d06e6c7472137 /pkg/api
parentbd711358525b09ebc4cb49094a674700b87f7ec0 (diff)
parent4e0326241b35d2549fdba5666f343c31279e18e4 (diff)
downloadpodman-e5e625b2a6481dd49d1d6303df1157c8a51dd7c2.tar.gz
podman-e5e625b2a6481dd49d1d6303df1157c8a51dd7c2.tar.bz2
podman-e5e625b2a6481dd49d1d6303df1157c8a51dd7c2.zip
Merge pull request #5872 from jwhonce/wip/options
V2 Fix support for tcp://[::]<port> connections
Diffstat (limited to 'pkg/api')
-rw-r--r--pkg/api/server/server.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 5f1a86183..9576fd437 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -51,7 +51,7 @@ func NewServerWithSettings(runtime *libpod.Runtime, duration time.Duration, list
func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Listener) (*APIServer, error) {
// If listener not provided try socket activation protocol
if listener == nil {
- if _, found := os.LookupEnv("LISTEN_FDS"); !found {
+ if _, found := os.LookupEnv("LISTEN_PID"); !found {
return nil, errors.Errorf("Cannot create API Server, no listener provided and socket activation protocol is not active.")
}
@@ -125,7 +125,7 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
if err != nil {
methods = []string{"<N/A>"}
}
- logrus.Debugf("Methods: %s Path: %s", strings.Join(methods, ", "), path)
+ logrus.Debugf("Methods: %6s Path: %s", strings.Join(methods, ", "), path)
return nil
})
}
@@ -179,6 +179,7 @@ func (s *APIServer) Shutdown() error {
}
// Gracefully shutdown server, duration of wait same as idle window
+ // TODO: Should we really wait the idle window for shutdown?
ctx, cancel := context.WithTimeout(context.Background(), s.idleTracker.Duration)
defer cancel()
go func() {