Skip to content

Commit 1fc4ace

Browse files
add log-prefix to p2p pkg (#19529)
1 parent 5d92478 commit 1fc4ace

File tree

17 files changed

+53
-53
lines changed

17 files changed

+53
-53
lines changed

p2p/dial.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ loop:
261261

262262
case node := <-nodesCh:
263263
if err := d.checkDial(node); err != nil {
264-
d.log.Trace("Discarding dial candidate", "id", node.ID(), "ip", node.IP(), "reason", err)
264+
d.log.Trace("[p2p] Discarding dial candidate", "id", node.ID(), "ip", node.IP(), "reason", err)
265265
} else {
266266
d.startDial(newDialTask(node, dynDialedConn))
267267
}
@@ -295,7 +295,7 @@ loop:
295295
case node := <-d.addStaticCh:
296296
id := node.ID()
297297
_, exists := d.static[id]
298-
d.log.Trace("Adding static node", "id", id, "ip", node.IP(), "added", !exists)
298+
d.log.Trace("[p2p] Adding static node", "id", id, "ip", node.IP(), "added", !exists)
299299
if exists {
300300
continue loop
301301
}
@@ -308,7 +308,7 @@ loop:
308308
case node := <-d.remStaticCh:
309309
id := node.ID()
310310
task := d.static[id]
311-
d.log.Trace("Removing static node", "id", id, "ok", task != nil)
311+
d.log.Trace("[p2p] Removing static node", "id", id, "ok", task != nil)
312312
if task != nil {
313313
delete(d.static, id)
314314
if task.staticPoolIndex >= 0 {
@@ -464,7 +464,7 @@ func (d *dialScheduler) removeFromStaticPool(idx int) {
464464
// startDial runs the given dial task in a separate goroutine.
465465
func (d *dialScheduler) startDial(task *dialTask) {
466466
node := task.dest()
467-
d.log.Trace("Starting p2p dial", "id", node.ID(), "ip", node.IP(), "flag", task.flags)
467+
d.log.Trace("[p2p] Starting p2p dial", "id", node.ID(), "ip", node.IP(), "flag", task.flags)
468468
hkey := string(node.ID().Bytes())
469469
d.history.add(hkey, d.clock.Now().Add(dialHistoryExpiration))
470470
d.dialing[node.ID()] = task
@@ -543,13 +543,13 @@ func (t *dialTask) resolve(d *dialScheduler) bool {
543543
if t.resolveDelay > maxResolveDelay {
544544
t.resolveDelay = maxResolveDelay
545545
}
546-
d.log.Warn("Resolving node failed", "id", t.dest().ID(), "newdelay", t.resolveDelay)
546+
d.log.Warn("[p2p] Resolving node failed", "id", t.dest().ID(), "newdelay", t.resolveDelay)
547547
return false
548548
}
549549
// The node was found.
550550
t.resolveDelay = initialResolveDelay
551551
t.destPtr.Store(resolved)
552-
d.log.Trace("Resolved node", "id", resolved.ID(), "addr", &net.TCPAddr{IP: resolved.IP(), Port: resolved.TCP()})
552+
d.log.Trace("[p2p] Resolved node", "id", resolved.ID(), "addr", &net.TCPAddr{IP: resolved.IP(), Port: resolved.TCP()})
553553
return true
554554
}
555555

@@ -558,7 +558,7 @@ func (t *dialTask) dial(d *dialScheduler, dest *enode.Node) error {
558558
fd, err := d.dialer.Dial(d.ctx, dest)
559559
if err != nil {
560560
cleanErr := cleanupDialErr(err)
561-
d.log.Trace("Dial error", "id", dest.ID(), "addr", nodeAddr(dest), "conn", t.flags, "err", cleanErr)
561+
d.log.Trace("[p2p] Dial error", "id", dest.ID(), "addr", nodeAddr(dest), "conn", t.flags, "err", cleanErr)
562562

563563
d.mutex.Lock()
564564
d.errors[cleanErr.Error()] = d.errors[cleanErr.Error()] + 1

p2p/discover/lookup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func (it *lookup) query(n *enode.Node, reply chan<- []*enode.Node) {
138138
success := len(r) > 0
139139
it.tab.trackRequest(n, success, r)
140140
if err != nil {
141-
it.tab.log.Trace("FINDNODE failed", "id", n.ID(), "err", err)
141+
it.tab.log.Trace("[p2p] FINDNODE failed", "id", n.ID(), "err", err)
142142
}
143143
}
144144
reply <- r

p2p/discover/ntp.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ func checkClockDrift() {
4444
return
4545
}
4646
if drift < -driftThreshold || drift > driftThreshold {
47-
log.Warn(fmt.Sprintf("System clock seems off by %v, which can prevent network connectivity", drift))
48-
log.Warn("Please enable network time synchronisation in system settings.")
47+
log.Warn(fmt.Sprintf("[p2p] System clock seems off by %v, which can prevent network connectivity", drift))
48+
log.Warn("[p2p] Please enable network time synchronisation in system settings.")
4949
} else {
50-
log.Debug("NTP sanity check done", "drift", drift)
50+
log.Debug("[p2p] NTP sanity check done", "drift", drift)
5151
}
5252
}
5353

p2p/discover/table.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func (tab *Table) setFallbackNodes(nodes []*enode.Node) error {
211211
return fmt.Errorf("bad bootstrap node %q: %v", n, err)
212212
}
213213
if tab.cfg.NetRestrict != nil && !tab.cfg.NetRestrict.ContainsAddr(n.IPAddr()) {
214-
tab.log.Error("Bootstrap node filtered by netrestrict", "id", n.ID(), "ip", n.IPAddr())
214+
tab.log.Error("[p2p] Bootstrap node filtered by netrestrict", "id", n.ID(), "ip", n.IPAddr())
215215
continue
216216
}
217217
nursery = append(nursery, n)
@@ -453,7 +453,7 @@ func (tab *Table) loadSeedNodes() {
453453
if tab.log.Enabled(context.Background(), log.LvlTrace) {
454454
age := time.Since(tab.db.LastPongReceived(seed.ID(), seed.IPAddr()))
455455
addr, _ := seed.UDPEndpoint()
456-
tab.log.Trace("Found seed node in database", "id", seed.ID(), "addr", addr, "age", age)
456+
tab.log.Trace("[p2p] Found seed node in database", "id", seed.ID(), "addr", addr, "age", age)
457457
}
458458
tab.mutex.Lock()
459459
tab.handleAddNode(addNodeOp{node: seed, isInbound: false})
@@ -487,11 +487,11 @@ func (tab *Table) addIP(b *bucket, ip netip.Addr) bool {
487487
return true
488488
}
489489
if !tab.ips.AddAddr(ip) {
490-
tab.log.Debug("IP exceeds table limit", "ip", ip)
490+
tab.log.Debug("[p2p] IP exceeds table limit", "ip", ip)
491491
return false
492492
}
493493
if !b.ips.AddAddr(ip) {
494-
tab.log.Debug("IP exceeds bucket limit", "ip", ip)
494+
tab.log.Debug("[p2p] IP exceeds bucket limit", "ip", ip)
495495
tab.ips.RemoveAddr(ip)
496496
return false
497497
}
@@ -603,15 +603,15 @@ func (tab *Table) deleteInBucket(b *bucket, id enode.ID) *tableNode {
603603

604604
// Add replacement.
605605
if len(b.replacements) == 0 {
606-
tab.log.Debug("Removed dead node", "b", b.index, "id", n.ID(), "ip", n.IPAddr())
606+
tab.log.Debug("[p2p] Removed dead node", "b", b.index, "id", n.ID(), "ip", n.IPAddr())
607607
return nil
608608
}
609609
rindex := tab.rand.Intn(len(b.replacements))
610610
rep := b.replacements[rindex]
611611
b.replacements = slices.Delete(b.replacements, rindex, rindex+1)
612612
b.entries = append(b.entries, rep)
613613
tab.nodeAdded(b, rep)
614-
tab.log.Debug("Replaced dead node", "b", b.index, "id", n.ID(), "ip", n.IPAddr(), "r", rep.ID(), "rip", rep.IPAddr())
614+
tab.log.Debug("[p2p] Replaced dead node", "b", b.index, "id", n.ID(), "ip", n.IPAddr(), "r", rep.ID(), "rip", rep.IPAddr())
615615
return rep
616616
}
617617

p2p/discover/table_reval.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (tab *Table) doRevalidate(resp revalidationResponse, node *enode.Node) {
124124
if remoteSeq > node.Seq() {
125125
newrec, err := tab.net.RequestENR(node)
126126
if err != nil {
127-
tab.log.Debug("ENR request failed", "id", node.ID(), "err", err)
127+
tab.log.Debug("[p2p] ENR request failed", "id", node.ID(), "err", err)
128128
} else {
129129
resp.newRecord = newrec
130130
}

p2p/discover/v4_udp.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ func (t *UDPv4) findnode(toid enode.ID, toAddrPort netip.AddrPort, target v4wire
336336
nreceived++
337337
n, err := t.nodeFromRPC(toAddrPort, rn)
338338
if err != nil {
339-
t.log.Trace("Invalid neighbor node received", "ip", rn.IP, "addr", toAddrPort, "err", err)
339+
t.log.Trace("[p2p] Invalid neighbor node received", "ip", rn.IP, "addr", toAddrPort, "err", err)
340340
continue
341341
}
342342
nodes = append(nodes, n)
@@ -535,7 +535,7 @@ func (t *UDPv4) send(toaddr netip.AddrPort, toid enode.ID, req v4wire.Packet) ([
535535

536536
func (t *UDPv4) write(toaddr netip.AddrPort, toid enode.ID, what string, packet []byte) error {
537537
_, err := t.conn.WriteToUDPAddrPort(packet, toaddr)
538-
t.log.Trace(">> "+what, "id", toid, "addr", toaddr, "err", err)
538+
t.log.Trace("[p2p] >> "+what, "id", toid, "addr", toaddr, "err", err)
539539
return err
540540
}
541541

@@ -551,17 +551,17 @@ func (t *UDPv4) readLoop(unhandled chan<- ReadPacket) {
551551
nbytes, from, err := t.conn.ReadFromUDPAddrPort(buf)
552552
if netutil.IsTemporaryError(err) {
553553
// Ignore temporary read errors.
554-
t.log.Debug("Temporary UDP read error", "err", err)
554+
t.log.Debug("[p2p] Temporary UDP read error", "err", err)
555555
continue
556556
} else if err != nil {
557557
// Shut down the loop for permanent errors.
558558
if !errors.Is(err, io.EOF) {
559-
t.log.Debug("UDP read error", "err", err)
559+
t.log.Debug("[p2p] UDP read error", "err", err)
560560
}
561561
return
562562
}
563563
if err := t.handlePacket(from, buf[:nbytes]); err != nil && unhandled == nil {
564-
t.log.Debug("Bad discv4 packet", "addr", from, "err", err)
564+
t.log.Debug("[p2p] Bad discv4 packet", "addr", from, "err", err)
565565
} else if err != nil && unhandled != nil {
566566
select {
567567
case unhandled <- ReadPacket{buf[:nbytes], from}:
@@ -586,7 +586,7 @@ func (t *UDPv4) handlePacket(from netip.AddrPort, buf []byte) error {
586586
if packet.preverify != nil {
587587
err = packet.preverify(packet, from, fromID, fromKey)
588588
}
589-
t.log.Trace("<< "+packet.Name(), "id", fromID, "addr", from, "err", err)
589+
t.log.Trace("[p2p] << "+packet.Name(), "id", fromID, "addr", from, "err", err)
590590
if err == nil && packet.handle != nil {
591591
packet.handle(packet, from, fromID, hash)
592592
}

p2p/discover/v5_talk.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (t *talkSystem) handleRequest(id enode.ID, addr netip.AddrPort, req *v5wire
103103
case <-timeout.C:
104104
// Couldn't get it in time, drop the request.
105105
if time.Since(t.lastLog) > 5*time.Second {
106-
log.Warn("Dropping TALKREQ due to overload", "ndrop", t.dropCount)
106+
log.Warn("[p2p] Dropping TALKREQ due to overload", "ndrop", t.dropCount)
107107
t.lastLog = time.Now()
108108
t.dropCount++
109109
}

p2p/discover/v5_udp.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ func (t *UDPv5) waitForNodes(c *callV5, distances []uint) ([]*enode.Node, error)
459459
for _, record := range response.Nodes {
460460
node, err := t.verifyResponseNode(c, record, distances, seen)
461461
if err != nil {
462-
t.log.Debug("Invalid record in "+response.Name(), "id", c.node.ID(), "err", err)
462+
t.log.Debug("[p2p] Invalid record in "+response.Name(), "id", c.node.ID(), "err", err)
463463
continue
464464
}
465465
nodes = append(nodes, node)
@@ -695,12 +695,12 @@ func (t *UDPv5) send(toID enode.ID, toAddr netip.AddrPort, packet v5wire.Packet,
695695
enc, nonce, err := t.codec.Encode(toID, addr, packet, c)
696696
if err != nil {
697697
t.logcontext = append(t.logcontext, "err", err)
698-
t.log.Warn(">> "+packet.Name(), t.logcontext...)
698+
t.log.Warn("[p2p] >> "+packet.Name(), t.logcontext...)
699699
return nonce, err
700700
}
701701

702702
_, err = t.conn.WriteToUDPAddrPort(enc, toAddr)
703-
t.log.Trace(">> "+packet.Name(), t.logcontext...)
703+
t.log.Trace("[p2p] >> "+packet.Name(), t.logcontext...)
704704
return nonce, err
705705
}
706706

@@ -713,12 +713,12 @@ func (t *UDPv5) readLoop() {
713713
nbytes, from, err := t.conn.ReadFromUDPAddrPort(buf)
714714
if netutil.IsTemporaryError(err) {
715715
// Ignore temporary read errors.
716-
t.log.Debug("Temporary UDP read error", "err", err)
716+
t.log.Debug("[p2p] Temporary UDP read error", "err", err)
717717
continue
718718
} else if err != nil {
719719
// Shut down the loop for permanent errors.
720720
if !errors.Is(err, io.EOF) {
721-
t.log.Debug("UDP read error", "err", err)
721+
t.log.Debug("[p2p] UDP read error", "err", err)
722722
}
723723
return
724724
}
@@ -753,7 +753,7 @@ func (t *UDPv5) handlePacket(rawpacket []byte, fromAddr netip.AddrPort) error {
753753
t.unhandled <- up
754754
return nil
755755
}
756-
t.log.Trace("Bad discv5 packet", "id", fromID, "addr", addr, "err", err)
756+
t.log.Trace("[p2p] Bad discv5 packet", "id", fromID, "addr", addr, "err", err)
757757
return err
758758
}
759759
if fromNode != nil {
@@ -764,7 +764,7 @@ func (t *UDPv5) handlePacket(rawpacket []byte, fromAddr netip.AddrPort) error {
764764
// WHOAREYOU logged separately to report errors.
765765
t.logcontext = append(t.logcontext[:0], "id", fromID, "addr", addr)
766766
t.logcontext = packet.AppendLogInfo(t.logcontext)
767-
t.log.Trace("<< "+packet.Name(), t.logcontext...)
767+
t.log.Trace("[p2p] << "+packet.Name(), t.logcontext...)
768768
}
769769
t.handle(packet, fromID, fromAddr)
770770
return nil
@@ -875,7 +875,7 @@ func (t *UDPv5) handleWhoareyou(p *v5wire.Whoareyou, fromID enode.ID, fromAddr n
875875
return
876876
}
877877
// Resend the call that was answered by WHOAREYOU.
878-
t.log.Trace("<< "+p.Name(), "id", c.node.ID(), "addr", fromAddr)
878+
t.log.Trace("[p2p] << "+p.Name(), "id", c.node.ID(), "addr", fromAddr)
879879
c.handshakeCount++
880880
c.challenge = p
881881
p.Node = c.node

p2p/dnsdisc/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func NewClient(cfg Config) *Client {
104104

105105
entries, err := lru.New[string, entry](cfg.CacheLimit)
106106
if err != nil {
107-
log.Warn("can't create lru", "err", err)
107+
log.Warn("[p2p] can't create lru", "err", err)
108108
}
109109
return &Client{
110110
cfg: cfg,

p2p/enode/localnode.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ func (ln *LocalNode) sign() {
301301
panic(fmt.Errorf("enode: can't verify local record: %v", err))
302302
}
303303
ln.cur.Store(n)
304-
log.Trace("New local node record", "seq", ln.seq, "id", n.ID(), "ip", n.IPAddr(), "udp", n.UDP(), "tcp", n.TCP())
304+
log.Trace("[p2p] New local node record", "seq", ln.seq, "id", n.ID(), "ip", n.IPAddr(), "udp", n.UDP(), "tcp", n.TCP())
305305
}
306306

307307
func (ln *LocalNode) bumpSeq() {

0 commit comments

Comments
 (0)