Skip to content

Commit 2565436

Browse files
authored
Revert "cmd/devp2p: make crawler-route53-updater less verbose (ethereum#27116)"
This reverts commit 758e98b.
1 parent b120ce1 commit 2565436

File tree

2 files changed

+6
-22
lines changed

2 files changed

+6
-22
lines changed

cmd/devp2p/dns_cloudflare.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (c *cloudflareClient) uploadRecords(name string, records map[string]string)
144144
_, err = c.CreateDNSRecord(context.Background(), c.zoneID, record)
145145
} else if old.Content != val {
146146
// Entry already exists, only change its content.
147-
log.Info(fmt.Sprintf("Updating %s from %q to %q", path, old.Content, val))
147+
log.Debug(fmt.Sprintf("Updating %s from %q to %q", path, old.Content, val))
148148
updated++
149149
old.Content = val
150150
err = c.UpdateDNSRecord(context.Background(), c.zoneID, old.ID, old)

cmd/devp2p/dns_route53.go

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,7 @@ func (c *route53Client) computeChanges(name string, records map[string]string, e
221221
}
222222
records = lrecords
223223

224-
var (
225-
changes []types.Change
226-
inserts int
227-
upserts int
228-
skips int
229-
)
230-
224+
var changes []types.Change
231225
for path, newValue := range records {
232226
prevRecords, exists := existing[path]
233227
prevValue := strings.Join(prevRecords.values, "")
@@ -243,30 +237,20 @@ func (c *route53Client) computeChanges(name string, records map[string]string, e
243237

244238
if !exists {
245239
// Entry is unknown, push a new one
246-
log.Debug(fmt.Sprintf("Creating %s = %s", path, newValue))
240+
log.Info(fmt.Sprintf("Creating %s = %s", path, newValue))
247241
changes = append(changes, newTXTChange("CREATE", path, ttl, newValue))
248-
inserts++
249242
} else if prevValue != newValue || prevRecords.ttl != ttl {
250243
// Entry already exists, only change its content.
251244
log.Info(fmt.Sprintf("Updating %s from %s to %s", path, prevValue, newValue))
252245
changes = append(changes, newTXTChange("UPSERT", path, ttl, newValue))
253-
upserts++
254246
} else {
255247
log.Debug(fmt.Sprintf("Skipping %s = %s", path, newValue))
256-
skips++
257248
}
258249
}
259250

260251
// Iterate over the old records and delete anything stale.
261-
deletions := makeDeletionChanges(existing, records)
262-
changes = append(changes, deletions...)
263-
264-
log.Info("Computed DNS changes",
265-
"changes", len(changes),
266-
"inserts", inserts,
267-
"skips", skips,
268-
"deleted", len(deletions),
269-
"upserts", upserts)
252+
changes = append(changes, makeDeletionChanges(existing, records)...)
253+
270254
// Ensure changes are in the correct order.
271255
sortChanges(changes)
272256
return changes
@@ -279,7 +263,7 @@ func makeDeletionChanges(records map[string]recordSet, keep map[string]string) [
279263
if _, ok := keep[path]; ok {
280264
continue
281265
}
282-
log.Debug(fmt.Sprintf("Deleting %s = %s", path, strings.Join(set.values, "")))
266+
log.Info(fmt.Sprintf("Deleting %s = %s", path, strings.Join(set.values, "")))
283267
changes = append(changes, newTXTChange("DELETE", path, set.ttl, set.values...))
284268
}
285269
return changes

0 commit comments

Comments
 (0)