diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-20 16:51:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-20 16:51:18 -0400 |
| commit | e48aa8c82f7f26260f6911bb3ea99ff54c294675 (patch) | |
| tree | 49731898aa4da73b2a527b19923f5a15ce9296e7 /pkg | |
| parent | 4b3fc0c67a1eb4970b55828e1e1ac1c9679ef656 (diff) | |
| parent | 7bcfae44b987bec083263bb9cb5c711df624bc3c (diff) | |
| download | podman-e48aa8c82f7f26260f6911bb3ea99ff54c294675.tar.gz podman-e48aa8c82f7f26260f6911bb3ea99ff54c294675.tar.bz2 podman-e48aa8c82f7f26260f6911bb3ea99ff54c294675.zip | |
Merge pull request #10298 from jwhonce/wip/service
[NO TESTS NEEDED] Downgrade API service routing table output
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/server/server.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index e23448fd1..972541bc6 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -136,7 +136,7 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li } } - if logrus.IsLevelEnabled(logrus.DebugLevel) { + if logrus.IsLevelEnabled(logrus.TraceLevel) { router.Walk(func(route *mux.Route, r *mux.Router, ancestors []*mux.Route) error { // nolint path, err := route.GetPathTemplate() if err != nil { @@ -146,7 +146,7 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li if err != nil { methods = []string{"<N/A>"} } - logrus.Debugf("Methods: %6s Path: %s", strings.Join(methods, ", "), path) + logrus.Tracef("Methods: %6s Path: %s", strings.Join(methods, ", "), path) return nil }) } @@ -162,13 +162,12 @@ func setupSystemd() { if len(os.Getenv("NOTIFY_SOCKET")) == 0 { return } - payload := fmt.Sprintf("MAINPID=%d", os.Getpid()) - payload += "\n" + payload := fmt.Sprintf("MAINPID=%d\n", os.Getpid()) payload += daemon.SdNotifyReady if sent, err := daemon.SdNotify(true, payload); err != nil { logrus.Errorf("Error notifying systemd of Conmon PID: %s", err.Error()) - } else if sent { - logrus.Debugf("Notify sent successfully") + } else if !sent { + logrus.Warn("SDNotify not sent successfully") } if err := os.Unsetenv("INVOCATION_ID"); err != nil { |