mirror of
https://github.com/containers/podman.git
synced 2026-03-06 07:52:56 -05:00
Replace deprecated ioutil
Package `io/ioutil` was deprecated in golang 1.16, preventing podman from building under Fedora 37. Fortunately, functionality identical replacements are provided by the packages `io` and `os`. Replace all usage of all `io/ioutil` symbols with appropriate substitutions according to the golang docs. Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
@@ -2,7 +2,6 @@ package server
|
||||
|
||||
import (
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
@@ -41,7 +40,7 @@ func loggingHandler() mux.MiddlewareFunc {
|
||||
"API": "request",
|
||||
"X-Reference-Id": r.Header.Get("X-Reference-Id"),
|
||||
})
|
||||
r.Body = ioutil.NopCloser(
|
||||
r.Body = io.NopCloser(
|
||||
io.TeeReader(r.Body, annotated.WriterLevel(logrus.TraceLevel)))
|
||||
|
||||
w = responseWriter{ResponseWriter: w}
|
||||
|
||||
@@ -2,7 +2,7 @@ package server
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
"github.com/containers/podman/v4/pkg/api/types"
|
||||
@@ -17,7 +17,7 @@ import (
|
||||
func referenceIDHandler() mux.MiddlewareFunc {
|
||||
return func(h http.Handler) http.Handler {
|
||||
// Only log Apache access_log-like entries at Info level or below
|
||||
out := ioutil.Discard
|
||||
out := io.Discard
|
||||
if logrus.IsLevelEnabled(logrus.InfoLevel) {
|
||||
out = logrus.StandardLogger().Out
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user