Skip to content

Commit

Permalink
Revert "cmd/devp2p: make crawler-route53-updater less verbose (ethere…
Browse files Browse the repository at this point in the history
…um#27116)"

This reverts commit 758e98b.
  • Loading branch information
devopsbo3 authored Nov 10, 2023
1 parent c342730 commit 60593f4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 22 deletions.
2 changes: 1 addition & 1 deletion cmd/devp2p/dns_cloudflare.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
26 changes: 5 additions & 21 deletions cmd/devp2p/dns_route53.go
Original file line number Diff line number Diff line change
Expand Up @@ -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, "")
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 60593f4

Please sign in to comment.