diff options
| author | KallyDev <36319157+kallydev@users.noreply.github.com> | 2021-09-30 01:17:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 11:17:48 -0600 |
| commit | c48fadc4a7655008d13076c7f757c36368e2ca13 (patch) | |
| tree | 3fe2837e02e9b664dd5b86afbe42494ac20997f8 /cmd/main.go | |
| parent | 059fc32f002d00e980b438b3edbdf7b8bcdf9a90 (diff) | |
Move from deprecated ioutil to os and io packages (#4364)
Diffstat (limited to 'cmd/main.go')
| -rw-r--r-- | cmd/main.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd/main.go b/cmd/main.go index 8a9a289..7c33c55 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -20,7 +20,6 @@ import ( "flag" "fmt" "io" - "io/ioutil" "log" "net" "os" @@ -94,7 +93,7 @@ func Main() { // the bytes in expect, or returns an error if it doesn't. func handlePingbackConn(conn net.Conn, expect []byte) error { defer conn.Close() - confirmationBytes, err := ioutil.ReadAll(io.LimitReader(conn, 32)) + confirmationBytes, err := io.ReadAll(io.LimitReader(conn, 32)) if err != nil { return err } @@ -124,9 +123,9 @@ func loadConfig(configFile, adapterName string) ([]byte, string, error) { var err error if configFile != "" { if configFile == "-" { - config, err = ioutil.ReadAll(os.Stdin) + config, err = io.ReadAll(os.Stdin) } else { - config, err = ioutil.ReadFile(configFile) + config, err = os.ReadFile(configFile) } if err != nil { return nil, "", fmt.Errorf("reading config file: %v", err) @@ -140,7 +139,7 @@ func loadConfig(configFile, adapterName string) ([]byte, string, error) { // plugged in, and if so, try using a default Caddyfile cfgAdapter = caddyconfig.GetAdapter("caddyfile") if cfgAdapter != nil { - config, err = ioutil.ReadFile("Caddyfile") + config, err = os.ReadFile("Caddyfile") if os.IsNotExist(err) { // okay, no default Caddyfile; pretend like this never happened cfgAdapter = nil |