Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-02 18:23:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up most errors and warnings from lint tools. (#165)

Browse Source
This commit is contained in:
Joe Blow
2016-06-11 08:00:47 +10:00
committed by Miek Gieben
parent 255aa2e5d5
commit 2882991000
12 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
middleware/etcd/etcd.go
View File

@@ -114,7 +114,7 @@ Nodes:
bx[b] = true
serv.Key = n.Key
serv.Ttl = g.Ttl(n, serv)
serv.Ttl = g.TTL(n, serv)
if serv.Priority == 0 {
serv.Priority = priority
}
@@ -123,22 +123,22 @@ Nodes:
return sx, nil
}
// Ttl returns the smaller of the etcd TTL and the service's
// TTL returns the smaller of the etcd TTL and the service's
// TTL. If neither of these are set (have a zero value), a default is used.
func (g Etcd) Ttl(node *etcdc.Node, serv *msg.Service) uint32 {
etcdTtl := uint32(node.TTL)
func (g Etcd) TTL(node *etcdc.Node, serv *msg.Service) uint32 {
etcdTTL := uint32(node.TTL)
if etcdTtl == 0 && serv.Ttl == 0 {
if etcdTTL == 0 && serv.Ttl == 0 {
return ttl
}
if etcdTtl == 0 {
if etcdTTL == 0 {
return serv.Ttl
}
if serv.Ttl == 0 {
return etcdTtl
return etcdTTL
}
if etcdTtl < serv.Ttl {
return etcdTtl
if etcdTTL < serv.Ttl {
return etcdTTL
}
return serv.Ttl
}
@@ -154,7 +154,7 @@ func isEtcdNameError(err error) bool {
const (
priority = 10 // default priority when nothing is set
ttl = 300 // default ttl when nothing is set
minTtl = 60
minTTL = 60
hostmaster = "hostmaster"
etcdTimeout = 5 * time.Second
)