summaryrefslogtreecommitdiff
path: root/pkg/api/server
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2021-11-05 10:12:32 -0700
committerJhon Honce <jhonce@redhat.com>2021-11-05 10:34:02 -0700
commit5c0351cc6f1b532cbdd1602736ad3ddac99fec01 (patch)
treea9de5a5242c6ecf1b63b148f3f99eb1fde0d4846 /pkg/api/server
parent9b3b44903d4d494186bd767d2ea5f3b2c753a7f2 (diff)
downloadpodman-5c0351cc6f1b532cbdd1602736ad3ddac99fec01.tar.gz
podman-5c0351cc6f1b532cbdd1602736ad3ddac99fec01.tar.bz2
podman-5c0351cc6f1b532cbdd1602736ad3ddac99fec01.zip
Log Apache access_log-like entries at Info level [NO NEW TESTS NEEDED]
Only log API access entries when --log-level set to Info or below. Fixes #12181 Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'pkg/api/server')
-rw-r--r--pkg/api/server/handler_rid.go9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkg/api/server/handler_rid.go b/pkg/api/server/handler_rid.go
index b624b99a6..7dcf436f7 100644
--- a/pkg/api/server/handler_rid.go
+++ b/pkg/api/server/handler_rid.go
@@ -2,6 +2,7 @@ package server
import (
"fmt"
+ "io/ioutil"
"net/http"
"github.com/containers/podman/v3/pkg/api/types"
@@ -15,7 +16,13 @@ import (
// and Apache style request logging
func referenceIDHandler() mux.MiddlewareFunc {
return func(h http.Handler) http.Handler {
- return handlers.CombinedLoggingHandler(logrus.StandardLogger().Out,
+ // Only log Apache access_log-like entries at Info level or below
+ out := ioutil.Discard
+ if logrus.IsLevelEnabled(logrus.InfoLevel) {
+ out = logrus.StandardLogger().Out
+ }
+
+ return handlers.CombinedLoggingHandler(out,
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
rid := r.Header.Get("X-Reference-Id")
if rid == "" {