TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Clean up remove caddy refs (#139)

Browse source 
* Changed reference to Caddy over to CoreDNS

* Removing references to caddy

* Fixed misleading error message to reference coredns

* Cleaning up references to caddy

* Adding clean and deps targets

Muscle memory is resulting in "make clean" commands.

* Adding test target to makefile

* More "Caddy" cleanup
This commit is contained in:
Michael Richmond 2016-04-28 11:07:44 -07:00 • committed by Miek Gieben
parent bba63f7765
commit e34280e7af
19 changed files with 146 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

28
core/setup/log.go
View file

@ -7,7 +7,7 @@ import (
"github.com/hashicorp/go-syslog"
"github.com/miekg/coredns/middleware"
caddylog "github.com/miekg/coredns/middleware/log"
corednslog "github.com/miekg/coredns/middleware/log"
"github.com/miekg/coredns/server"
"github.com/miekg/dns"
)
@ -30,7 +30,7 @@ func Log(c *Controller) (middleware.Middleware, error) {
} else if rules[i].OutputFile == "stderr" {
writer = os.Stderr
} else if rules[i].OutputFile == "syslog" {
writer, err = gsyslog.NewLogger(gsyslog.LOG_INFO, "LOCAL0", "caddy")
writer, err = gsyslog.NewLogger(gsyslog.LOG_INFO, "LOCAL0", "coredns")
if err != nil {
return err
}
@ -56,12 +56,12 @@ func Log(c *Controller) (middleware.Middleware, error) {
})
return func(next middleware.Handler) middleware.Handler {
return caddylog.Logger{Next: next, Rules: rules, ErrorFunc: server.DefaultErrorFunc}
return corednslog.Logger{Next: next, Rules: rules, ErrorFunc: server.DefaultErrorFunc}
}, nil
}
func logParse(c *Controller) ([]caddylog.Rule, error) {
var rules []caddylog.Rule
func logParse(c *Controller) ([]corednslog.Rule, error) {
var rules []corednslog.Rule
for c.Next() {
args := c.RemainingArgs()
@ -88,37 +88,37 @@ func logParse(c *Controller) ([]caddylog.Rule, error) {
}
if len(args) == 0 {
// Nothing specified; use defaults
rules = append(rules, caddylog.Rule{
rules = append(rules, corednslog.Rule{
NameScope: ".",
OutputFile: caddylog.DefaultLogFilename,
Format: caddylog.DefaultLogFormat,
OutputFile: corednslog.DefaultLogFilename,
Format: corednslog.DefaultLogFormat,
Roller: logRoller,
})
} else if len(args) == 1 {
// Only an output file specified
rules = append(rules, caddylog.Rule{
rules = append(rules, corednslog.Rule{
NameScope: ".",
OutputFile: args[0],
Format: caddylog.DefaultLogFormat,
Format: corednslog.DefaultLogFormat,
Roller: logRoller,
})
} else {
// Name scope, output file, and maybe a format specified
format := caddylog.DefaultLogFormat
format := corednslog.DefaultLogFormat
if len(args) > 2 {
switch args[2] {
case "{common}":
format = caddylog.CommonLogFormat
format = corednslog.CommonLogFormat
case "{combined}":
format = caddylog.CombinedLogFormat
format = corednslog.CombinedLogFormat
default:
format = args[2]
}
}
rules = append(rules, caddylog.Rule{
rules = append(rules, corednslog.Rule{
NameScope: dns.Fqdn(args[0]),
OutputFile: args[1],
Format: format,