summaryrefslogtreecommitdiff
path: root/caddyconfig/caddyfile
diff options
context:
space:
mode:
authorFrancis Lavoie <lavofr@gmail.com>2022-04-25 12:12:10 -0400
committerGitHub <noreply@github.com>2022-04-25 10:12:10 -0600
commit3a1e0dbf47429f3ae7ddcbbd9acc3707b0ad0083 (patch)
tree9851651f43be2d09103a1c76c15430c0ed5e8f6c /caddyconfig/caddyfile
parent77a77c0219d389717ba3b8f8e28bad3462fab655 (diff)
httpcaddyfile: Deprecate paths in site addresses; use zap logs (#4728)
Diffstat (limited to 'caddyconfig/caddyfile')
-rw-r--r--caddyconfig/caddyfile/parse.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/caddyconfig/caddyfile/parse.go b/caddyconfig/caddyfile/parse.go
index b463238..2c2da0f 100644
--- a/caddyconfig/caddyfile/parse.go
+++ b/caddyconfig/caddyfile/parse.go
@@ -18,13 +18,13 @@ import (
"bytes"
"fmt"
"io"
- "log"
"os"
"path/filepath"
"strconv"
"strings"
"github.com/caddyserver/caddy/v2"
+ "go.uber.org/zap"
)
// Parse parses the input just enough to group tokens, in
@@ -393,7 +393,7 @@ func (p *parser) doImport() error {
}
if len(matches) == 0 {
if strings.ContainsAny(globPattern, "*?[]") {
- log.Printf("[WARNING] No files matching import glob pattern: %s", importPattern)
+ caddy.Log().Warn("No files matching import glob pattern", zap.String("pattern", importPattern))
} else {
return p.Errf("File to import not found: %s", importPattern)
}