diff options
author | 2018-04-19 07:41:56 +0100 | |
---|---|---|
committer | 2018-04-19 07:41:56 +0100 | |
commit | 26d1432ae6c19c91fb6358e7629a9179a85b70f7 (patch) | |
tree | 8a9f94cf11dcebf1f079ab478d4ded4bf710c99f /plugin/etcd | |
parent | 2095eb7979f53618180f759d0e68e4070554870d (diff) | |
download | coredns-26d1432ae6c19c91fb6358e7629a9179a85b70f7.tar.gz coredns-26d1432ae6c19c91fb6358e7629a9179a85b70f7.tar.zst coredns-26d1432ae6c19c91fb6358e7629a9179a85b70f7.zip |
Update all plugins to use plugin/pkg/log (#1694)
* Update all plugins to use plugin/pkg/log
I wish this could have been done with sed. Alas manually changed all
callers to use the new plugin/pkg/log package.
* Error -> Info
* Add docs to debug plugin as well
Diffstat (limited to 'plugin/etcd')
-rw-r--r-- | plugin/etcd/stub.go | 6 | ||||
-rw-r--r-- | plugin/etcd/stub_handler.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugin/etcd/stub.go b/plugin/etcd/stub.go index d7b9d5036..683217733 100644 --- a/plugin/etcd/stub.go +++ b/plugin/etcd/stub.go @@ -1,13 +1,13 @@ package etcd import ( - "log" "net" "strconv" "time" "github.com/coredns/coredns/plugin/etcd/msg" "github.com/coredns/coredns/plugin/pkg/dnsutil" + "github.com/coredns/coredns/plugin/pkg/log" "github.com/coredns/coredns/plugin/proxy" "github.com/coredns/coredns/request" @@ -50,7 +50,7 @@ Services: } ip := net.ParseIP(serv.Host) if ip == nil { - log.Printf("[WARNING] Non IP address stub nameserver: %s", serv.Host) + log.Warningf("Non IP address stub nameserver: %s", serv.Host) continue } @@ -64,7 +64,7 @@ Services: // We must *also* chop of dns.stub. which means cutting two more labels. domain = dnsutil.Join(labels[1 : len(labels)-dns.CountLabel(z)-2]) if domain == z { - log.Printf("[WARNING] Skipping nameserver for domain we are authoritative for: %s", domain) + log.Warningf("Skipping nameserver for domain we are authoritative for: %s", domain) continue Services } } diff --git a/plugin/etcd/stub_handler.go b/plugin/etcd/stub_handler.go index 6f4a49950..6f1e7750e 100644 --- a/plugin/etcd/stub_handler.go +++ b/plugin/etcd/stub_handler.go @@ -2,8 +2,8 @@ package etcd import ( "errors" - "log" + "github.com/coredns/coredns/plugin/pkg/log" "github.com/coredns/coredns/request" "github.com/miekg/dns" @@ -19,7 +19,7 @@ type Stub struct { // ServeDNS implements the plugin.Handler interface. func (s Stub) ServeDNS(ctx context.Context, w dns.ResponseWriter, req *dns.Msg) (int, error) { if hasStubEdns0(req) { - log.Printf("[WARNING] Forwarding cycle detected, refusing msg: %s", req.Question[0].Name) + log.Warningf("Forwarding cycle detected, refusing msg: %s", req.Question[0].Name) return dns.RcodeRefused, errors.New("stub forward cycle") } req = addStubEdns0(req) |