mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

AXFRPROVIDER: Don't count "reports" as a change (#2372)

Browse Source
This commit is contained in:
Florian Ritterhoff
2023-05-18 21:14:12 +02:00
committed by GitHub
parent e4f9dd0459
commit 8ba95d4d31
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
providers/axfrddns/axfrddnsProvider.go
View File

@@ -341,6 +341,11 @@ func (c *axfrddnsProvider) GetZoneRecords(domain string, meta map[string]string)
// BuildCorrection return a Correction for a given set of DDNS update and the corresponding message. // BuildCorrection return a Correction for a given set of DDNS update and the corresponding message.
func (c *axfrddnsProvider) BuildCorrection(dc *models.DomainConfig, msgs []string, update *dns.Msg) *models.Correction { func (c *axfrddnsProvider) BuildCorrection(dc *models.DomainConfig, msgs []string, update *dns.Msg) *models.Correction {
if update == nil {
return &models.Correction{
Msg: fmt.Sprintf("DDNS UPDATES to '%s' (primary master: '%s'). Changes:\n%s", dc.Name, c.master, strings.Join(msgs, "\n")),
}
}
return &models.Correction{ return &models.Correction{
Msg: fmt.Sprintf("DDNS UPDATES to '%s' (primary master: '%s'). Changes:\n%s", dc.Name, c.master, strings.Join(msgs, "\n")), Msg: fmt.Sprintf("DDNS UPDATES to '%s' (primary master: '%s'). Changes:\n%s", dc.Name, c.master, strings.Join(msgs, "\n")),
F: func() error { F: func() error {
@@ -435,6 +440,7 @@ func (c *axfrddnsProvider) GetZoneRecordsCorrections(dc *models.DomainConfig, fo
// at the end of the batched update. // at the end of the batched update.
var msgs []string var msgs []string
var reports []string
var msgs2 []string var msgs2 []string
update := new(dns.Msg) update := new(dns.Msg)
update.SetUpdate(dc.Name + ".") update.SetUpdate(dc.Name + ".")
@@ -610,7 +616,7 @@ func (c *axfrddnsProvider) GetZoneRecordsCorrections(dc *models.DomainConfig, fo
update.Insert([]dns.RR{change.New[0].ToRR()}) update.Insert([]dns.RR{change.New[0].ToRR()})
} }
case diff2.REPORT: case diff2.REPORT:
msgs = append(msgs, change.Msgs...) reports = append(reports, change.Msgs...)
} }
} }
@@ -618,14 +624,16 @@ func (c *axfrddnsProvider) GetZoneRecordsCorrections(dc *models.DomainConfig, fo
update.Remove([]dns.RR{dummyNs2}) update.Remove([]dns.RR{dummyNs2})
} }
if hasTwoCorrections { returnValue := []*models.Correction{}
return []*models.Correction{
c.BuildCorrection(dc, msgs, update),
c.BuildCorrection(dc, msgs2, update2),
}, nil
}
return []*models.Correction{
c.BuildCorrection(dc, msgs, update),
}, nil
if len(msgs) > 0 {
returnValue = append(returnValue, c.BuildCorrection(dc, msgs, update))
}
if hasTwoCorrections && len(msgs2) > 0 {
returnValue = append(returnValue, c.BuildCorrection(dc, msgs2, update2))
}
if len(reports) > 0 {
returnValue = append(returnValue, c.BuildCorrection(dc, reports, nil))
}
return returnValue, nil
} }