github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-11 00:13:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

chore: check against errors of io/fs instead of os (#6011)

Browse Source 
* chore: replace `os.ErrNotExist` with `fs.ErrNotExist`

* check against permission error from `io/fs` package
This commit is contained in:
Mohammed Al Sahaf
2024-01-02 08:48:55 +03:00
committed by GitHub
parent b568a10dd4
commit 787f6b257f
7 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/main.go
View File

@ -21,6 +21,7 @@ import (
"flag"
"fmt"
"io"
"io/fs"
"log"
"net"
"os"
@ -128,7 +129,7 @@ func loadConfigWithLogger(logger *zap.Logger, configFile, adapterName string) ([
cfgAdapter = caddyconfig.GetAdapter("caddyfile")
if cfgAdapter != nil {
config, err = os.ReadFile("Caddyfile")
if os.IsNotExist(err) {
if errors.Is(err, fs.ErrNotExist) {
// okay, no default Caddyfile; pretend like this never happened
cfgAdapter = nil
} else if err != nil {