OSDN Git Service
(root)
/
bytom
/
bytom.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ec8a013
)
modify p2p network log level
fix_p2p_log_level
author
iczc
<iczcalan@gmail.com>
Wed, 23 Oct 2019 07:09:03 +0000
(15:09 +0800)
committer
iczc
<iczcalan@gmail.com>
Wed, 23 Oct 2019 07:09:03 +0000
(15:09 +0800)
p2p/switch.go
patch
|
blob
|
history
diff --git
a/p2p/switch.go
b/p2p/switch.go
index
f2148d8
..
5d84b30
100644
(file)
--- a/
p2p/switch.go
+++ b/
p2p/switch.go
@@
-264,12
+264,12
@@
func (sw *Switch) DialPeerWithAddress(addr *NetAddress) error {
pc, err := newOutboundPeerConn(addr, sw.nodePrivKey, sw.peerConfig)
if err != nil {
pc, err := newOutboundPeerConn(addr, sw.nodePrivKey, sw.peerConfig)
if err != nil {
- log.WithFields(log.Fields{"module": logModule, "address": addr, " err": err}).
Error
("DialPeer fail on newOutboundPeerConn")
+ log.WithFields(log.Fields{"module": logModule, "address": addr, " err": err}).
Warn
("DialPeer fail on newOutboundPeerConn")
return err
}
if err = sw.AddPeer(pc, addr.isLAN); err != nil {
return err
}
if err = sw.AddPeer(pc, addr.isLAN); err != nil {
- log.WithFields(log.Fields{"module": logModule, "address": addr, " err": err}).
Error
("DialPeer fail on switch AddPeer")
+ log.WithFields(log.Fields{"module": logModule, "address": addr, " err": err}).
Warn
("DialPeer fail on switch AddPeer")
pc.CloseConn()
return err
}
pc.CloseConn()
return err
}
@@
-350,14
+350,14
@@
func (sw *Switch) addPeerWithConnection(conn net.Conn) error {
peerConn, err := newInboundPeerConn(conn, sw.nodePrivKey, sw.Config.P2P)
if err != nil {
if err := conn.Close(); err != nil {
peerConn, err := newInboundPeerConn(conn, sw.nodePrivKey, sw.Config.P2P)
if err != nil {
if err := conn.Close(); err != nil {
- log.WithFields(log.Fields{"module": logModule, "remote peer:": conn.RemoteAddr().String(), " err:": err}).
Error
("closes connection err")
+ log.WithFields(log.Fields{"module": logModule, "remote peer:": conn.RemoteAddr().String(), " err:": err}).
Warn
("closes connection err")
}
return err
}
if err = sw.AddPeer(peerConn, false); err != nil {
if err := conn.Close(); err != nil {
}
return err
}
if err = sw.AddPeer(peerConn, false); err != nil {
if err := conn.Close(); err != nil {
- log.WithFields(log.Fields{"module": logModule, "remote peer:": conn.RemoteAddr().String(), " err:": err}).
Error
("closes connection err")
+ log.WithFields(log.Fields{"module": logModule, "remote peer:": conn.RemoteAddr().String(), " err:": err}).
Warn
("closes connection err")
}
return err
}
}
return err
}
@@
-472,7
+472,7
@@
func (sw *Switch) listenerRoutine(l Listener) {
// disconnect if we alrady have MaxNumPeers
if sw.peers.Size() >= sw.Config.P2P.MaxNumPeers {
if err := inConn.Close(); err != nil {
// disconnect if we alrady have MaxNumPeers
if sw.peers.Size() >= sw.Config.P2P.MaxNumPeers {
if err := inConn.Close(); err != nil {
- log.WithFields(log.Fields{"module": logModule, "remote peer:": inConn.RemoteAddr().String(), " err:": err}).
Error
("closes connection err")
+ log.WithFields(log.Fields{"module": logModule, "remote peer:": inConn.RemoteAddr().String(), " err:": err}).
Warn
("closes connection err")
}
log.Info("Ignoring inbound connection: already have enough peers.")
continue
}
log.Info("Ignoring inbound connection: already have enough peers.")
continue
@@
-488,7
+488,7
@@
func (sw *Switch) listenerRoutine(l Listener) {
func (sw *Switch) dialPeerWorker(a *NetAddress, wg *sync.WaitGroup) {
if err := sw.DialPeerWithAddress(a); err != nil {
func (sw *Switch) dialPeerWorker(a *NetAddress, wg *sync.WaitGroup) {
if err := sw.DialPeerWithAddress(a); err != nil {
- log.WithFields(log.Fields{"module": logModule, "addr": a, "err": err}).
Error
("dialPeerWorker fail on dial peer")
+ log.WithFields(log.Fields{"module": logModule, "addr": a, "err": err}).
Warn
("dialPeerWorker fail on dial peer")
}
wg.Done()
}
}
wg.Done()
}