diff --git a/cmd/devp2p/dns_cloudflare.go b/cmd/devp2p/dns_cloudflare.go index 798fdc733245..bfe92257ee5a 100644 --- a/cmd/devp2p/dns_cloudflare.go +++ b/cmd/devp2p/dns_cloudflare.go @@ -144,7 +144,7 @@ func (c *cloudflareClient) uploadRecords(name string, records map[string]string) _, err = c.CreateDNSRecord(context.Background(), c.zoneID, record) } else if old.Content != val { // Entry already exists, only change its content. - log.Info(fmt.Sprintf("Updating %s from %q to %q", path, old.Content, val)) + log.Debug(fmt.Sprintf("Updating %s from %q to %q", path, old.Content, val)) updated++ old.Content = val err = c.UpdateDNSRecord(context.Background(), c.zoneID, old.ID, old) diff --git a/cmd/devp2p/dns_route53.go b/cmd/devp2p/dns_route53.go index 400ab1b1cf05..81734eb2ad87 100644 --- a/cmd/devp2p/dns_route53.go +++ b/cmd/devp2p/dns_route53.go @@ -221,13 +221,7 @@ func (c *route53Client) computeChanges(name string, records map[string]string, e } records = lrecords - var ( - changes []types.Change - inserts int - upserts int - skips int - ) - + var changes []types.Change for path, newValue := range records { prevRecords, exists := existing[path] prevValue := strings.Join(prevRecords.values, "") @@ -243,30 +237,20 @@ func (c *route53Client) computeChanges(name string, records map[string]string, e if !exists { // Entry is unknown, push a new one - log.Debug(fmt.Sprintf("Creating %s = %s", path, newValue)) + log.Info(fmt.Sprintf("Creating %s = %s", path, newValue)) changes = append(changes, newTXTChange("CREATE", path, ttl, newValue)) - inserts++ } else if prevValue != newValue || prevRecords.ttl != ttl { // Entry already exists, only change its content. log.Info(fmt.Sprintf("Updating %s from %s to %s", path, prevValue, newValue)) changes = append(changes, newTXTChange("UPSERT", path, ttl, newValue)) - upserts++ } else { log.Debug(fmt.Sprintf("Skipping %s = %s", path, newValue)) - skips++ } } // Iterate over the old records and delete anything stale. - deletions := makeDeletionChanges(existing, records) - changes = append(changes, deletions...) - - log.Info("Computed DNS changes", - "changes", len(changes), - "inserts", inserts, - "skips", skips, - "deleted", len(deletions), - "upserts", upserts) + changes = append(changes, makeDeletionChanges(existing, records)...) + // Ensure changes are in the correct order. sortChanges(changes) return changes @@ -279,7 +263,7 @@ func makeDeletionChanges(records map[string]recordSet, keep map[string]string) [ if _, ok := keep[path]; ok { continue } - log.Debug(fmt.Sprintf("Deleting %s = %s", path, strings.Join(set.values, ""))) + log.Info(fmt.Sprintf("Deleting %s = %s", path, strings.Join(set.values, ""))) changes = append(changes, newTXTChange("DELETE", path, set.ttl, set.values...)) } return changes