luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #10473 from knusbaum/ioutil 

{api,command/agent}: change io.Discard to ioutil.Discard
This commit is contained in:
Daniel Nephin 2021-06-24 11:59:46 -04:00 committed by GitHub
parent 682dd6cad1 4ad13c37db
commit 6dca50ac41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/api.go
View File

@ -1069,7 +1069,7 @@ func requireOK(d time.Duration, resp *http.Response, e error) (time.Duration, *h
// is necessary to ensure that the http.Client's underlying RoundTripper is able // is necessary to ensure that the http.Client's underlying RoundTripper is able
// to re-use the TCP connection. See godoc on net/http.Client.Do. // to re-use the TCP connection. See godoc on net/http.Client.Do.
func closeResponseBody(resp *http.Response) error { func closeResponseBody(resp *http.Response) error {
_, _ = io.Copy(io.Discard, resp.Body) _, _ = io.Copy(ioutil.Discard, resp.Body)
return resp.Body.Close() return resp.Body.Close()
} }

4
command/agent/agent.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"flag" "flag"
"fmt" "fmt"
"io" "io/ioutil"
"os" "os"
"os/signal" "os/signal"
"path/filepath" "path/filepath"
@ -182,7 +182,7 @@ func (c *cmd) run(args []string) int {
if config.Logging.LogJSON { if config.Logging.LogJSON {
// Hide all non-error output when JSON logging is enabled. // Hide all non-error output when JSON logging is enabled.
ui.Ui = &cli.BasicUI{ ui.Ui = &cli.BasicUI{
BasicUi: mcli.BasicUi{ErrorWriter: c.ui.Stderr(), Writer: io.Discard}, BasicUi: mcli.BasicUi{ErrorWriter: c.ui.Stderr(), Writer: ioutil.Discard},
} }
} }