Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Remove bogus "NS request" log line #316

Merged
merged 2 commits into from
Oct 8, 2015
Merged

Remove bogus "NS request" log line #316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b272ee9
Remove bogus "NS request" log line
Oct 8, 2015
b162b8d
Reduce code duplication identified by godupl in CI
Oct 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 7 additions & 20 deletions resolver/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func (res *Resolver) formatA(dom string, target string) (*dns.A, error) {
}

// formatSOA returns the SOA resource record for the mesos domain
func (res *Resolver) formatSOA(dom string) (*dns.SOA, error) {
func (res *Resolver) formatSOA(dom string) *dns.SOA {
ttl := uint32(res.config.TTL)

return &dns.SOA{
Expand All @@ -219,11 +219,11 @@ func (res *Resolver) formatSOA(dom string) (*dns.SOA, error) {
Retry: res.config.SOARetry,
Expire: res.config.SOAExpire,
Minttl: ttl,
}, nil
}
}

// formatNS returns the NS record for the mesos domain
func (res *Resolver) formatNS(dom string) (*dns.NS, error) {
func (res *Resolver) formatNS(dom string) *dns.NS {
ttl := uint32(res.config.TTL)

return &dns.NS{
Expand All @@ -234,7 +234,7 @@ func (res *Resolver) formatNS(dom string) (*dns.NS, error) {
Ttl: ttl,
},
Ns: res.config.SOAMname,
}, nil
}
}

// reorders answers for very basic load balancing
Expand Down Expand Up @@ -358,21 +358,12 @@ func (res *Resolver) handleA(rs *records.RecordGenerator, name string, m *dns.Ms
}

func (res *Resolver) handleSOA(m, r *dns.Msg) error {
rr, err := res.formatSOA(r.Question[0].Name)
if err != nil {
return err
}
m.Ns = append(m.Ns, rr)
m.Ns = append(m.Ns, res.formatSOA(r.Question[0].Name))
return nil
}

func (res *Resolver) handleNS(m, r *dns.Msg) error {
rr, err := res.formatNS(r.Question[0].Name)
logging.Error.Println("NS request")
if err != nil {
return err
}
m.Ns = append(m.Ns, rr)
m.Ns = append(m.Ns, res.formatNS(r.Question[0].Name))
return nil
}

Expand All @@ -393,12 +384,8 @@ func (res *Resolver) handleEmpty(rs *records.RecordGenerator, name string, m, r
logging.VeryVerbose.Println("total A rrs:\t" + strconv.Itoa(len(rs.As)))
logging.VeryVerbose.Println("failed looking for " + r.Question[0].String())

rr, err := res.formatSOA(r.Question[0].Name)
if err != nil {
return err
}
m.Ns = append(m.Ns, res.formatSOA(r.Question[0].Name))

m.Ns = append(m.Ns, rr)
return nil
}

Expand Down