aboutsummaryrefslogtreecommitdiff
path: root/core/setup/log.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2016-03-19 11:20:43 +0000
committerGravatar Miek Gieben <miek@miek.nl> 2016-03-19 11:20:43 +0000
commit19ea6c2a301c772dff0eaedabda9a11f89030e96 (patch)
tree586c2e59bc6adbe64f4ca4561038a917266ce95d /core/setup/log.go
parent3511c87d03de75b0f7206fe266e70791d6088835 (diff)
parent39dbd447b5214bf8c3d25f09b91351fa18062e57 (diff)
downloadcoredns-19ea6c2a301c772dff0eaedabda9a11f89030e96.tar.gz
coredns-19ea6c2a301c772dff0eaedabda9a11f89030e96.tar.zst
coredns-19ea6c2a301c772dff0eaedabda9a11f89030e96.zip
Merge pull request #19 from miekg/middleware/log
Fix middleware log
Diffstat (limited to 'core/setup/log.go')
-rw-r--r--core/setup/log.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/core/setup/log.go b/core/setup/log.go
index 32d9f3250..29c3b8746 100644
--- a/core/setup/log.go
+++ b/core/setup/log.go
@@ -9,6 +9,7 @@ import (
"github.com/miekg/coredns/middleware"
caddylog "github.com/miekg/coredns/middleware/log"
"github.com/miekg/coredns/server"
+ "github.com/miekg/dns"
)
// Log sets up the logging middleware.
@@ -88,7 +89,7 @@ func logParse(c *Controller) ([]caddylog.Rule, error) {
if len(args) == 0 {
// Nothing specified; use defaults
rules = append(rules, caddylog.Rule{
- PathScope: "/",
+ NameScope: ".",
OutputFile: caddylog.DefaultLogFilename,
Format: caddylog.DefaultLogFormat,
Roller: logRoller,
@@ -96,13 +97,13 @@ func logParse(c *Controller) ([]caddylog.Rule, error) {
} else if len(args) == 1 {
// Only an output file specified
rules = append(rules, caddylog.Rule{
- PathScope: "/",
+ NameScope: ".",
OutputFile: args[0],
Format: caddylog.DefaultLogFormat,
Roller: logRoller,
})
} else {
- // Path scope, output file, and maybe a format specified
+ // Name scope, output file, and maybe a format specified
format := caddylog.DefaultLogFormat
@@ -118,7 +119,7 @@ func logParse(c *Controller) ([]caddylog.Rule, error) {
}
rules = append(rules, caddylog.Rule{
- PathScope: args[0],
+ NameScope: dns.Fqdn(args[0]),
OutputFile: args[1],
Format: format,
Roller: logRoller,