diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-05-26 16:51:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-26 16:51:21 +0200 |
| commit | a5a2416b3533ed6b188ce8457adf5aa1f86cf49f (patch) | |
| tree | 282472758d960d7f8ad4d2fee7ee7f2b5d6bdfee /pkg/api | |
| parent | b909bcaed613eb94333641fff4250c07f1ab4323 (diff) | |
| parent | f49023031d85ddf5700855ac374e63e2bbaa653e (diff) | |
| download | podman-a5a2416b3533ed6b188ce8457adf5aa1f86cf49f.tar.gz podman-a5a2416b3533ed6b188ce8457adf5aa1f86cf49f.tar.bz2 podman-a5a2416b3533ed6b188ce8457adf5aa1f86cf49f.zip | |
Merge pull request #10461 from mheon/rc3_backports
Backports for v3.2.0-RC3
Diffstat (limited to 'pkg/api')
| -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 { |