opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 00:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Downgrade API service routing table logging

Browse Source 
[NO TESTS NEEDED]

* Log the routing table output at Trace vs. Debug level. Reduce noise
  in debugging output.
* Tweak SDNotify message to report Warn when it fails. Previously
  failures were silent.

Signed-off-by: Jhon Honce <jhonce@redhat.com>
This commit is contained in:
Jhon Honce
2021-05-10 10:22:33 -07:00
committed by Matthew Heon
parent efa15b96c5
commit 18e917cdc3
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/api/server/server.go
View File

@ -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 router.Walk(func(route *mux.Route, r *mux.Router, ancestors []*mux.Route) error { // nolint
path, err := route.GetPathTemplate() path, err := route.GetPathTemplate()
if err != nil { if err != nil {
@ -146,7 +146,7 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
if err != nil { if err != nil {
methods = []string{"<N/A>"} 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 return nil
}) })
} }
@ -162,13 +162,12 @@ func setupSystemd() {
if len(os.Getenv("NOTIFY_SOCKET")) == 0 { if len(os.Getenv("NOTIFY_SOCKET")) == 0 {
return return
} }
payload := fmt.Sprintf("MAINPID=%d", os.Getpid()) payload := fmt.Sprintf("MAINPID=%d\n", os.Getpid())
payload += "\n"
payload += daemon.SdNotifyReady payload += daemon.SdNotifyReady
if sent, err := daemon.SdNotify(true, payload); err != nil { if sent, err := daemon.SdNotify(true, payload); err != nil {
logrus.Errorf("Error notifying systemd of Conmon PID: %s", err.Error()) logrus.Errorf("Error notifying systemd of Conmon PID: %s", err.Error())
} else if sent { } else if !sent {
logrus.Debugf("Notify sent successfully") logrus.Warn("SDNotify not sent successfully")
} }
if err := os.Unsetenv("INVOCATION_ID"); err != nil { if err := os.Unsetenv("INVOCATION_ID"); err != nil {