From 57cf24763821e68b8520e6093a62b31a593f49bc Mon Sep 17 00:00:00 2001 From: dylenfu Date: Sat, 9 May 2020 15:28:28 +0800 Subject: [PATCH] p2pserver: replace package name and log --- common/common.go | 10 +-- methods/net_server.go | 14 +-- .../connect_controller/connect_controller.go | 22 ++--- .../connect_controller_test.go | 6 +- p2pserver/connect_controller/connection.go | 6 +- p2pserver/connect_controller/transport.go | 2 +- p2pserver/dht/dht.go | 10 +-- p2pserver/dht/dht_test.go | 2 +- p2pserver/dht/kbucket/bucket.go | 2 +- p2pserver/dht/kbucket/sorting.go | 2 +- p2pserver/dht/kbucket/table.go | 2 +- p2pserver/dht/kbucket/table_test.go | 2 +- p2pserver/handshake/handshake.go | 6 +- p2pserver/handshake/handshake_test.go | 6 +- p2pserver/link/link.go | 14 +-- p2pserver/link/link_test.go | 7 +- p2pserver/message/msg_pack/msg_pack.go | 36 ++++---- p2pserver/message/types/address.go | 2 +- p2pserver/message/types/address_req.go | 2 +- p2pserver/message/types/address_test.go | 2 +- p2pserver/message/types/block.go | 2 +- p2pserver/message/types/block_header.go | 2 +- p2pserver/message/types/block_headers_req.go | 2 +- p2pserver/message/types/blocks_req.go | 2 +- p2pserver/message/types/consensus.go | 2 +- p2pserver/message/types/consensus_payload.go | 2 +- p2pserver/message/types/data_req.go | 2 +- p2pserver/message/types/find_node.go | 2 +- p2pserver/message/types/find_node_test.go | 2 +- p2pserver/message/types/inventory.go | 2 +- p2pserver/message/types/message.go | 2 +- p2pserver/message/types/message_test.go | 2 +- p2pserver/message/types/notfound.go | 2 +- p2pserver/message/types/ping.go | 2 +- p2pserver/message/types/pong.go | 2 +- p2pserver/message/types/transaction.go | 2 +- p2pserver/message/types/update_kadid.go | 2 +- p2pserver/message/types/verack.go | 2 +- p2pserver/message/types/version.go | 2 +- p2pserver/mock/dialer.go | 4 +- p2pserver/mock/discovery_test.go | 26 +++--- p2pserver/mock/interface.go | 10 +-- p2pserver/mock/listener.go | 2 +- p2pserver/mock/mocknet.go | 2 +- p2pserver/mock/mocknet_test.go | 2 +- p2pserver/mock/reserved_test.go | 6 +- p2pserver/net/netserver/nbr_peers.go | 12 +-- p2pserver/net/netserver/netserver.go | 34 +++---- p2pserver/net/protocol/protocol.go | 4 +- p2pserver/net/protocol/server.go | 6 +- p2pserver/p2pserver.go | 12 +-- p2pserver/peer/peer.go | 28 +++--- p2pserver/protocols/block_sync/block_sync.go | 46 +++++----- p2pserver/protocols/bootstrap/bootstrap.go | 18 ++-- p2pserver/protocols/discovery/discovery.go | 40 ++++----- p2pserver/protocols/heatbeat/heartbeat.go | 14 +-- p2pserver/protocols/msg_handler.go | 88 +++++++++---------- .../protocols/recent_peers/recent_peers.go | 16 ++-- p2pserver/protocols/reconnect/reconnect.go | 18 ++-- 59 files changed, 289 insertions(+), 292 deletions(-) diff --git a/common/common.go b/common/common.go index 20bb5c6..336faaf 100644 --- a/common/common.go +++ b/common/common.go @@ -38,23 +38,23 @@ import ( var sdk = gosdk.NewOntologySdk() func Initialize() { - sdk.NewRpcClient().SetAddress(config.DefConfig.JsonRpcAddress) + sdk.NewRpcClient().SetAddress(config.DefConfig.Sdk.JsonRpcAddress) } func GetAccountByPassword(path string) (*gosdk.Account, bool) { wallet, err := sdk.OpenWallet(path) if err != nil { - log4.Error("open wallet error:", err) + log4.Logf(log4.ERROR, "open wallet error:", err) return nil, false } pwd, err := password.GetPassword() if err != nil { - log4.Error("getPassword error:", err) + log4.Logf(log4.ERROR, "getPassword error:", err) return nil, false } user, err := wallet.GetDefaultAccount(pwd) if err != nil { - log4.Error("getDefaultAccount error:", err) + log4.Logf(log4.ERROR, "getDefaultAccount error:", err) return nil, false } return user, true @@ -86,7 +86,7 @@ func InvokeNativeContractWithMultiSign( func WaitForBlock(sdk *gosdk.OntologySdk) bool { _, err := sdk.WaitForGenerateBlock(30*time.Second, 1) if err != nil { - log4.Error("WaitForGenerateBlock error:", err) + log4.Logf(log4.ERROR, "WaitForGenerateBlock error:", err) return false } return true diff --git a/methods/net_server.go b/methods/net_server.go index 091a1a5..5225ac5 100644 --- a/methods/net_server.go +++ b/methods/net_server.go @@ -22,13 +22,13 @@ import ( "fmt" log4 "github.com/alecthomas/log4go" "github.com/ontio/ontology-tool/config" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/connect_controller" + "github.com/ontio/ontology-tool/p2pserver/message/types" + netsvr "github.com/ontio/ontology-tool/p2pserver/net/netserver" commCfg "github.com/ontio/ontology/common/config" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/connect_controller" - "github.com/ontio/ontology/p2pserver/message/types" - netsvr "github.com/ontio/ontology/p2pserver/net/netserver" - // "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/peer" + // "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/peer" "net" "time" ) @@ -88,7 +88,7 @@ func (s *NetServer) init(conf *commCfg.P2PNodeConfig, version string) error { return fmt.Errorf("[p2p]failed to create sync listener") } - log4.Info("[p2p]init peer ID to ", s.base.Id.ToHexString()) + log4.Info("[p2p]init peer ID to %s", s.base.Id.ToHexString()) return nil } diff --git a/p2pserver/connect_controller/connect_controller.go b/p2pserver/connect_controller/connect_controller.go index bd8e78b..98f0d8c 100644 --- a/p2pserver/connect_controller/connect_controller.go +++ b/p2pserver/connect_controller/connect_controller.go @@ -25,10 +25,10 @@ import ( "sync" "sync/atomic" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/handshake" - "github.com/ontio/ontology/p2pserver/peer" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/handshake" + "github.com/ontio/ontology-tool/p2pserver/peer" "github.com/scylladb/go-set/strset" ) @@ -209,7 +209,7 @@ func (self *ConnectController) AcceptConnect(conn net.Conn) (*peer.PeerInfo, net wrapped := self.savePeer(conn, peerInfo, INBOUND_INDEX) - log.Infof("inbound peer %s connected, %s", conn.RemoteAddr().String(), peerInfo) + log4.Info("inbound peer %s connected, %s", conn.RemoteAddr().String(), peerInfo) return peerInfo, wrapped, nil } @@ -245,7 +245,7 @@ func (self *ConnectController) Connect(addr string) (*peer.PeerInfo, net.Conn, e wrapped := self.savePeer(conn, peerInfo, OUTBOUND_INDEX) - log.Infof("outbound peer %s connected. %s", conn.RemoteAddr().String(), peerInfo) + log4.Info("outbound peer %s connected. %s", conn.RemoteAddr().String(), peerInfo) return peerInfo, wrapped, nil } @@ -292,7 +292,7 @@ func (self *ConnectController) beforeHandshakeCheck(addr string, index int) erro func (self *ConnectController) isHandWithSelf(remotePeer *peer.PeerInfo, remoteAddr string) error { addrIp, err := common.ParseIPAddr(remoteAddr) if err != nil { - log.Warn(err) + log4.Warn(err) return err } nodeAddr := addrIp + ":" + strconv.Itoa(int(remotePeer.Port)) @@ -343,7 +343,7 @@ func (self *ConnectController) removePeer(conn *Conn) { p := self.peers[conn.kid] if p == nil || p.peer == nil { - log.Fatalf("connection %s not in controller", conn.kid.ToHexString()) + log4.Crashf("connection %s not in controller", conn.kid.ToHexString()) } else if p.connectId == conn.connectId { // connection not replaced delete(self.peers, conn.kid) } @@ -359,19 +359,19 @@ func (self *ConnectController) checkPeerIdAndIP(peer *peer.PeerInfo, addr string ipOld, err := common.ParseIPAddr(oldPeer.addr) if err != nil { err := fmt.Errorf("[createPeer]exist peer ip format is wrong %s", oldPeer.addr) - log.Fatal(err) + log4.Crash(err) return err } ipNew, err := common.ParseIPAddr(addr) if err != nil { err := fmt.Errorf("[createPeer]connecting peer ip format is wrong %s, close", addr) - log.Fatal(err) + log4.Crash(err) return err } if ipNew != ipOld { err := fmt.Errorf("[createPeer]same peer id from different addr: %s, %s close latest one", ipOld, ipNew) - log.Warn(err) + log4.Warn(err) return err } diff --git a/p2pserver/connect_controller/connect_controller_test.go b/p2pserver/connect_controller/connect_controller_test.go index fa881bd..4152d48 100644 --- a/p2pserver/connect_controller/connect_controller_test.go +++ b/p2pserver/connect_controller/connect_controller_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/handshake" - "github.com/ontio/ontology/p2pserver/peer" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/handshake" + "github.com/ontio/ontology-tool/p2pserver/peer" "github.com/stretchr/testify/assert" ) diff --git a/p2pserver/connect_controller/connection.go b/p2pserver/connect_controller/connection.go index 98aec2f..3469255 100644 --- a/p2pserver/connect_controller/connection.go +++ b/p2pserver/connect_controller/connection.go @@ -20,8 +20,8 @@ package connect_controller import ( "net" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" ) // Conn is a net.Conn wrapper to do some clean up when Close. @@ -37,7 +37,7 @@ type Conn struct { // Close overwrite net.Conn // warning: this method will try to lock the controller, be carefull to avoid deadlock func (self *Conn) Close() error { - log.Infof("closing connection: peer %s, address: %s", self.kid.ToHexString(), self.addr) + log4.Info("closing connection: peer %s, address: %s", self.kid.ToHexString(), self.addr) self.controller.removePeer(self) diff --git a/p2pserver/connect_controller/transport.go b/p2pserver/connect_controller/transport.go index bf5d8dc..c9a2af8 100644 --- a/p2pserver/connect_controller/transport.go +++ b/p2pserver/connect_controller/transport.go @@ -27,8 +27,8 @@ import ( "strconv" "time" + "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common/config" - "github.com/ontio/ontology/p2pserver/common" ) type Dialer interface { diff --git a/p2pserver/dht/dht.go b/p2pserver/dht/dht.go index 248f36e..0b46eb8 100644 --- a/p2pserver/dht/dht.go +++ b/p2pserver/dht/dht.go @@ -21,9 +21,9 @@ package dht import ( "time" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - kb "github.com/ontio/ontology/p2pserver/dht/kbucket" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + kb "github.com/ontio/ontology-tool/p2pserver/dht/kbucket" ) // Pool size is the number of nodes used for group find/set RPC calls @@ -55,11 +55,11 @@ func NewDHT(id common.PeerId) *DHT { rt := kb.NewRoutingTable(bucketSize, id) rt.PeerAdded = func(p common.PeerId) { - log.Debugf("dht: peer: %d added to dht", p) + log4.Debug("dht: peer: %d added to dht", p) } rt.PeerRemoved = func(p common.PeerId) { - log.Debugf("dht: peer: %d removed from dht", p) + log4.Debug("dht: peer: %d removed from dht", p) } return &DHT{ diff --git a/p2pserver/dht/dht_test.go b/p2pserver/dht/dht_test.go index 0e827fb..122e519 100644 --- a/p2pserver/dht/dht_test.go +++ b/p2pserver/dht/dht_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ontio/ontology/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/common" "github.com/stretchr/testify/assert" ) diff --git a/p2pserver/dht/kbucket/bucket.go b/p2pserver/dht/kbucket/bucket.go index 66661c5..b9087d0 100644 --- a/p2pserver/dht/kbucket/bucket.go +++ b/p2pserver/dht/kbucket/bucket.go @@ -22,7 +22,7 @@ import ( "container/list" "sync" - "github.com/ontio/ontology/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/common" ) // Bucket holds a list of peers. diff --git a/p2pserver/dht/kbucket/sorting.go b/p2pserver/dht/kbucket/sorting.go index 1a17cb8..7cca913 100644 --- a/p2pserver/dht/kbucket/sorting.go +++ b/p2pserver/dht/kbucket/sorting.go @@ -23,7 +23,7 @@ import ( "container/list" "sort" - "github.com/ontio/ontology/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/common" ) // A helper struct to sort peers by their distance to the local node diff --git a/p2pserver/dht/kbucket/table.go b/p2pserver/dht/kbucket/table.go index 3c2654f..b308e62 100644 --- a/p2pserver/dht/kbucket/table.go +++ b/p2pserver/dht/kbucket/table.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ontio/ontology/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/common" ) var ErrPeerRejectedHighLatency = errors.New("peer rejected; latency too high") diff --git a/p2pserver/dht/kbucket/table_test.go b/p2pserver/dht/kbucket/table_test.go index e7aeb4c..396e9f4 100644 --- a/p2pserver/dht/kbucket/table_test.go +++ b/p2pserver/dht/kbucket/table_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ontio/ontology/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/common" "github.com/scylladb/go-set/strset" "github.com/stretchr/testify/require" ) diff --git a/p2pserver/handshake/handshake.go b/p2pserver/handshake/handshake.go index 84966ae..fe90e2c 100644 --- a/p2pserver/handshake/handshake.go +++ b/p2pserver/handshake/handshake.go @@ -23,10 +23,10 @@ import ( "time" "github.com/blang/semver" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/message/types" + "github.com/ontio/ontology-tool/p2pserver/peer" common2 "github.com/ontio/ontology/common" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/message/types" - "github.com/ontio/ontology/p2pserver/peer" ) var HANDSHAKE_DURATION = 10 * time.Second // handshake time can not exceed this duration, or will treat as attack. diff --git a/p2pserver/handshake/handshake_test.go b/p2pserver/handshake/handshake_test.go index d24b26d..a1b9353 100644 --- a/p2pserver/handshake/handshake_test.go +++ b/p2pserver/handshake/handshake_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/message/types" - "github.com/ontio/ontology/p2pserver/peer" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/message/types" + "github.com/ontio/ontology-tool/p2pserver/peer" "github.com/stretchr/testify/assert" ) diff --git a/p2pserver/link/link.go b/p2pserver/link/link.go index 8e67ded..9c13787 100644 --- a/p2pserver/link/link.go +++ b/p2pserver/link/link.go @@ -25,10 +25,10 @@ import ( "net" "time" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/message/types" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/message/types" ) //Link used to establish @@ -109,7 +109,7 @@ func (this *Link) Rx() { for { msg, payloadSize, err := types.ReadMessage(reader) if err != nil { - log.Infof("[p2p]error read from %s :%s", this.GetAddr(), err.Error()) + log4.Info("[p2p]error read from %s :%s", this.GetAddr(), err.Error()) break } @@ -117,7 +117,7 @@ func (this *Link) Rx() { this.UpdateRXTime(t) if !this.needSendMsg(msg) { - log.Debugf("skip handle msgType:%s from:%d", msg.CmdType(), this.id) + log4.Debug("skip handle msgType:%s from:%d", msg.CmdType(), this.id) continue } @@ -155,7 +155,7 @@ func (this *Link) SendRaw(rawPacket []byte) error { return errors.New("[p2p]tx link invalid") } nByteCnt := len(rawPacket) - log.Tracef("[p2p]TX buf length: %d\n", nByteCnt) + log4.Debug("[p2p]TX buf length: %d", nByteCnt) nCount := nByteCnt / common.PER_SEND_LEN if nCount == 0 { @@ -164,7 +164,7 @@ func (this *Link) SendRaw(rawPacket []byte) error { _ = conn.SetWriteDeadline(time.Now().Add(time.Duration(nCount*common.WRITE_DEADLINE) * time.Second)) _, err := conn.Write(rawPacket) if err != nil { - log.Infof("[p2p] error sending messge to %s :%s", this.GetAddr(), err.Error()) + log4.Info("[p2p] error sending messge to %s :%s", this.GetAddr(), err.Error()) this.CloseConn() return err } diff --git a/p2pserver/link/link_test.go b/p2pserver/link/link_test.go index a8475e5..938be8e 100644 --- a/p2pserver/link/link_test.go +++ b/p2pserver/link/link_test.go @@ -24,12 +24,11 @@ import ( "time" "github.com/ontio/ontology-crypto/keypair" + "github.com/ontio/ontology-tool/p2pserver/common" + mt "github.com/ontio/ontology-tool/p2pserver/message/types" "github.com/ontio/ontology/account" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/common/log" ct "github.com/ontio/ontology/core/types" - "github.com/ontio/ontology/p2pserver/common" - mt "github.com/ontio/ontology/p2pserver/message/types" ) var ( @@ -42,8 +41,6 @@ var ( ) func init() { - log.InitLog(log.InfoLog, log.Stdout) - cliLink = NewLink() serverLink = NewLink() id := common.PseudoPeerIdFromUint64(0x733936) diff --git a/p2pserver/message/msg_pack/msg_pack.go b/p2pserver/message/msg_pack/msg_pack.go index c1e760c..59d8d0d 100644 --- a/p2pserver/message/msg_pack/msg_pack.go +++ b/p2pserver/message/msg_pack/msg_pack.go @@ -19,16 +19,16 @@ package msgpack import ( + msgCommon "github.com/ontio/ontology-tool/p2pserver/common" + mt "github.com/ontio/ontology-tool/p2pserver/message/types" "github.com/ontio/ontology/common" - "github.com/ontio/ontology/common/log" + //log4 "github.com/alecthomas/log4go" ct "github.com/ontio/ontology/core/types" - msgCommon "github.com/ontio/ontology/p2pserver/common" - mt "github.com/ontio/ontology/p2pserver/message/types" ) //Peer address package func NewAddrs(nodeAddrs []msgCommon.PeerAddr) mt.Message { - log.Trace() + //log4.Trace() var addr mt.Addr addr.NodeAddrs = nodeAddrs @@ -37,14 +37,14 @@ func NewAddrs(nodeAddrs []msgCommon.PeerAddr) mt.Message { //Peer address request package func NewAddrReq() mt.Message { - log.Trace() + //log4.Trace() var msg mt.AddrReq return &msg } ///block package func NewBlock(bk *ct.Block, ccMsg *ct.CrossChainMsg, merkleRoot common.Uint256) mt.Message { - log.Trace() + //log4.Trace() var blk mt.Block blk.Blk = bk blk.MerkleRoot = merkleRoot @@ -55,7 +55,7 @@ func NewBlock(bk *ct.Block, ccMsg *ct.CrossChainMsg, merkleRoot common.Uint256) //blk hdr package func NewHeaders(headers []*ct.RawHeader) mt.Message { - log.Trace() + //log4.Trace() var blkHdr mt.RawBlockHeader blkHdr.BlkHdr = headers @@ -64,7 +64,7 @@ func NewHeaders(headers []*ct.RawHeader) mt.Message { //blk hdr req package func NewHeadersReq(curHdrHash common.Uint256) mt.Message { - log.Trace() + //log4.Trace() var h mt.HeadersReq h.Len = 1 h.HashEnd = curHdrHash @@ -74,7 +74,7 @@ func NewHeadersReq(curHdrHash common.Uint256) mt.Message { ////Consensus info package func NewConsensus(cp *mt.ConsensusPayload) mt.Message { - log.Trace() + //log4.Trace() var cons mt.Consensus cons.Cons = *cp @@ -83,7 +83,7 @@ func NewConsensus(cp *mt.ConsensusPayload) mt.Message { //InvPayload func NewInvPayload(invType common.InventoryType, msg []common.Uint256) *mt.InvPayload { - log.Trace() + //log4.Trace() return &mt.InvPayload{ InvType: invType, Blk: msg, @@ -92,7 +92,7 @@ func NewInvPayload(invType common.InventoryType, msg []common.Uint256) *mt.InvPa //Inv request package func NewInv(invPayload *mt.InvPayload) mt.Message { - log.Trace() + //log4.Trace() var inv mt.Inv inv.P.Blk = invPayload.Blk inv.P.InvType = invPayload.InvType @@ -102,7 +102,7 @@ func NewInv(invPayload *mt.InvPayload) mt.Message { //NotFound package func NewNotFound(hash common.Uint256) mt.Message { - log.Trace() + //log4.Trace() var notFound mt.NotFound notFound.Hash = hash @@ -111,7 +111,7 @@ func NewNotFound(hash common.Uint256) mt.Message { //ping msg package func NewPingMsg(height uint64) *mt.Ping { - log.Trace() + //log4.Trace() var ping mt.Ping ping.Height = uint64(height) @@ -120,7 +120,7 @@ func NewPingMsg(height uint64) *mt.Ping { //pong msg package func NewPongMsg(height uint64) *mt.Pong { - log.Trace() + //log4.Trace() var pong mt.Pong pong.Height = uint64(height) @@ -129,7 +129,7 @@ func NewPongMsg(height uint64) *mt.Pong { //Transaction package func NewTxn(txn *ct.Transaction) mt.Message { - log.Trace() + //log4.Trace() var trn mt.Trn trn.Txn = txn @@ -138,7 +138,7 @@ func NewTxn(txn *ct.Transaction) mt.Message { //transaction request package func NewTxnDataReq(hash common.Uint256) mt.Message { - log.Trace() + //log4.Trace() var dataReq mt.DataReq dataReq.DataType = common.TRANSACTION dataReq.Hash = hash @@ -148,7 +148,7 @@ func NewTxnDataReq(hash common.Uint256) mt.Message { //block request package func NewBlkDataReq(hash common.Uint256) mt.Message { - log.Trace() + //log4.Trace() var dataReq mt.DataReq dataReq.DataType = common.BLOCK dataReq.Hash = hash @@ -158,7 +158,7 @@ func NewBlkDataReq(hash common.Uint256) mt.Message { //consensus request package func NewConsensusDataReq(hash common.Uint256) mt.Message { - log.Trace() + //log4.Trace() var dataReq mt.DataReq dataReq.DataType = common.CONSENSUS dataReq.Hash = hash diff --git a/p2pserver/message/types/address.go b/p2pserver/message/types/address.go index 134ed16..7ea398c 100644 --- a/p2pserver/message/types/address.go +++ b/p2pserver/message/types/address.go @@ -21,8 +21,8 @@ package types import ( "io" + comm "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" - comm "github.com/ontio/ontology/p2pserver/common" ) type Addr struct { diff --git a/p2pserver/message/types/address_req.go b/p2pserver/message/types/address_req.go index 5385ab7..1fd811f 100644 --- a/p2pserver/message/types/address_req.go +++ b/p2pserver/message/types/address_req.go @@ -19,8 +19,8 @@ package types import ( + comm "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" - comm "github.com/ontio/ontology/p2pserver/common" ) type AddrReq struct{} diff --git a/p2pserver/message/types/address_test.go b/p2pserver/message/types/address_test.go index 2f87287..ac7cad5 100644 --- a/p2pserver/message/types/address_test.go +++ b/p2pserver/message/types/address_test.go @@ -22,8 +22,8 @@ import ( "net" "testing" + comm "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" - comm "github.com/ontio/ontology/p2pserver/common" "github.com/stretchr/testify/assert" ) diff --git a/p2pserver/message/types/block.go b/p2pserver/message/types/block.go index 4534318..18a9330 100644 --- a/p2pserver/message/types/block.go +++ b/p2pserver/message/types/block.go @@ -21,9 +21,9 @@ package types import ( "fmt" + comm "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" "github.com/ontio/ontology/core/types" - comm "github.com/ontio/ontology/p2pserver/common" ) type Block struct { diff --git a/p2pserver/message/types/block_header.go b/p2pserver/message/types/block_header.go index 45c7bff..d88478e 100644 --- a/p2pserver/message/types/block_header.go +++ b/p2pserver/message/types/block_header.go @@ -22,9 +22,9 @@ import ( "fmt" "io" + comm "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" ct "github.com/ontio/ontology/core/types" - comm "github.com/ontio/ontology/p2pserver/common" ) type BlkHeader struct { diff --git a/p2pserver/message/types/block_headers_req.go b/p2pserver/message/types/block_headers_req.go index 7946ccf..ed70e63 100644 --- a/p2pserver/message/types/block_headers_req.go +++ b/p2pserver/message/types/block_headers_req.go @@ -21,8 +21,8 @@ package types import ( "io" + comm "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" - comm "github.com/ontio/ontology/p2pserver/common" ) type HeadersReq struct { diff --git a/p2pserver/message/types/blocks_req.go b/p2pserver/message/types/blocks_req.go index 0c0476e..3dbb42c 100644 --- a/p2pserver/message/types/blocks_req.go +++ b/p2pserver/message/types/blocks_req.go @@ -21,8 +21,8 @@ package types import ( "io" + "github.com/ontio/ontology-tool/p2pserver/common" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/p2pserver/common" ) type BlocksReq struct { diff --git a/p2pserver/message/types/consensus.go b/p2pserver/message/types/consensus.go index b387587..4d7a9ad 100644 --- a/p2pserver/message/types/consensus.go +++ b/p2pserver/message/types/consensus.go @@ -19,8 +19,8 @@ package types import ( + "github.com/ontio/ontology-tool/p2pserver/common" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/p2pserver/common" ) type Consensus struct { diff --git a/p2pserver/message/types/consensus_payload.go b/p2pserver/message/types/consensus_payload.go index dc484ef..c64c3b5 100644 --- a/p2pserver/message/types/consensus_payload.go +++ b/p2pserver/message/types/consensus_payload.go @@ -23,10 +23,10 @@ import ( "io" "github.com/ontio/ontology-crypto/keypair" + common2 "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" "github.com/ontio/ontology/core/signature" "github.com/ontio/ontology/errors" - common2 "github.com/ontio/ontology/p2pserver/common" ) type ConsensusPayload struct { diff --git a/p2pserver/message/types/data_req.go b/p2pserver/message/types/data_req.go index a683cd9..8849407 100644 --- a/p2pserver/message/types/data_req.go +++ b/p2pserver/message/types/data_req.go @@ -21,8 +21,8 @@ package types import ( "io" + comm "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" - comm "github.com/ontio/ontology/p2pserver/common" ) type DataReq struct { diff --git a/p2pserver/message/types/find_node.go b/p2pserver/message/types/find_node.go index 4915982..f3ed8e1 100644 --- a/p2pserver/message/types/find_node.go +++ b/p2pserver/message/types/find_node.go @@ -21,8 +21,8 @@ package types import ( "io" + ncomm "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" - ncomm "github.com/ontio/ontology/p2pserver/common" ) type FindNodeReq struct { diff --git a/p2pserver/message/types/find_node_test.go b/p2pserver/message/types/find_node_test.go index 03d704a..38b91fc 100644 --- a/p2pserver/message/types/find_node_test.go +++ b/p2pserver/message/types/find_node_test.go @@ -20,7 +20,7 @@ package types import ( "testing" - "github.com/ontio/ontology/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/common" ) func TestFindNodeRequest(t *testing.T) { diff --git a/p2pserver/message/types/inventory.go b/p2pserver/message/types/inventory.go index 13250ef..93a8626 100644 --- a/p2pserver/message/types/inventory.go +++ b/p2pserver/message/types/inventory.go @@ -21,8 +21,8 @@ package types import ( "io" + p2pCommon "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" - p2pCommon "github.com/ontio/ontology/p2pserver/common" ) var LastInvHash common.Uint256 diff --git a/p2pserver/message/types/message.go b/p2pserver/message/types/message.go index 0b0626d..e37f986 100644 --- a/p2pserver/message/types/message.go +++ b/p2pserver/message/types/message.go @@ -24,9 +24,9 @@ import ( "fmt" "io" + "github.com/ontio/ontology-tool/p2pserver/common" comm "github.com/ontio/ontology/common" "github.com/ontio/ontology/common/config" - "github.com/ontio/ontology/p2pserver/common" ) type Message interface { diff --git a/p2pserver/message/types/message_test.go b/p2pserver/message/types/message_test.go index 814c679..0827ce1 100644 --- a/p2pserver/message/types/message_test.go +++ b/p2pserver/message/types/message_test.go @@ -23,8 +23,8 @@ import ( "io" "testing" + "github.com/ontio/ontology-tool/p2pserver/common" common2 "github.com/ontio/ontology/common" - "github.com/ontio/ontology/p2pserver/common" "github.com/stretchr/testify/assert" ) diff --git a/p2pserver/message/types/notfound.go b/p2pserver/message/types/notfound.go index 8cb6af5..fc8fdd2 100644 --- a/p2pserver/message/types/notfound.go +++ b/p2pserver/message/types/notfound.go @@ -21,8 +21,8 @@ package types import ( "io" + comm "github.com/ontio/ontology-tool/p2pserver/common" "github.com/ontio/ontology/common" - comm "github.com/ontio/ontology/p2pserver/common" ) type NotFound struct { diff --git a/p2pserver/message/types/ping.go b/p2pserver/message/types/ping.go index 357d329..feb8b66 100644 --- a/p2pserver/message/types/ping.go +++ b/p2pserver/message/types/ping.go @@ -21,8 +21,8 @@ package types import ( "io" + "github.com/ontio/ontology-tool/p2pserver/common" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/p2pserver/common" ) type Ping struct { diff --git a/p2pserver/message/types/pong.go b/p2pserver/message/types/pong.go index e8a71dc..2a26f32 100644 --- a/p2pserver/message/types/pong.go +++ b/p2pserver/message/types/pong.go @@ -21,8 +21,8 @@ package types import ( "io" + "github.com/ontio/ontology-tool/p2pserver/common" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/p2pserver/common" ) type Pong struct { diff --git a/p2pserver/message/types/transaction.go b/p2pserver/message/types/transaction.go index bdc5c68..9a0ef3d 100644 --- a/p2pserver/message/types/transaction.go +++ b/p2pserver/message/types/transaction.go @@ -19,9 +19,9 @@ package types import ( + "github.com/ontio/ontology-tool/p2pserver/common" comm "github.com/ontio/ontology/common" "github.com/ontio/ontology/core/types" - "github.com/ontio/ontology/p2pserver/common" ) // Transaction message diff --git a/p2pserver/message/types/update_kadid.go b/p2pserver/message/types/update_kadid.go index d68605c..4662ecf 100644 --- a/p2pserver/message/types/update_kadid.go +++ b/p2pserver/message/types/update_kadid.go @@ -19,8 +19,8 @@ package types import ( + "github.com/ontio/ontology-tool/p2pserver/common" common2 "github.com/ontio/ontology/common" - "github.com/ontio/ontology/p2pserver/common" ) type UpdatePeerKeyId struct { diff --git a/p2pserver/message/types/verack.go b/p2pserver/message/types/verack.go index ee3ebca..9e6302c 100644 --- a/p2pserver/message/types/verack.go +++ b/p2pserver/message/types/verack.go @@ -21,8 +21,8 @@ package types import ( "io" + "github.com/ontio/ontology-tool/p2pserver/common" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/p2pserver/common" ) type VerACK struct { diff --git a/p2pserver/message/types/version.go b/p2pserver/message/types/version.go index 17c9a83..dd02932 100644 --- a/p2pserver/message/types/version.go +++ b/p2pserver/message/types/version.go @@ -21,8 +21,8 @@ package types import ( "io" + "github.com/ontio/ontology-tool/p2pserver/common" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/p2pserver/common" ) type VersionPayload struct { diff --git a/p2pserver/mock/dialer.go b/p2pserver/mock/dialer.go index 5b6a1db..55ddc98 100644 --- a/p2pserver/mock/dialer.go +++ b/p2pserver/mock/dialer.go @@ -22,8 +22,8 @@ import ( "errors" "net" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/connect_controller" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/connect_controller" ) type dialer struct { diff --git a/p2pserver/mock/discovery_test.go b/p2pserver/mock/discovery_test.go index 315242c..655235e 100644 --- a/p2pserver/mock/discovery_test.go +++ b/p2pserver/mock/discovery_test.go @@ -22,15 +22,15 @@ import ( "testing" "time" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/message/types" - msgTypes "github.com/ontio/ontology/p2pserver/message/types" - "github.com/ontio/ontology/p2pserver/net/netserver" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/peer" - "github.com/ontio/ontology/p2pserver/protocols/bootstrap" - "github.com/ontio/ontology/p2pserver/protocols/discovery" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/message/types" + msgTypes "github.com/ontio/ontology-tool/p2pserver/message/types" + "github.com/ontio/ontology-tool/p2pserver/net/netserver" + p2p "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/peer" + "github.com/ontio/ontology-tool/p2pserver/protocols/bootstrap" + "github.com/ontio/ontology-tool/p2pserver/protocols/discovery" "github.com/stretchr/testify/assert" ) @@ -75,7 +75,7 @@ func (self *DiscoveryProtocol) HandleSystemMessage(net p2p.P2P, msg p2p.SystemMe } func (self *DiscoveryProtocol) HandlePeerMessage(ctx *p2p.Context, msg msgTypes.Message) { - log.Trace("[p2p]receive message", ctx.Sender().GetAddr(), ctx.Sender().GetID()) + log4.Trace("[p2p]receive message", ctx.Sender().GetAddr(), ctx.Sender().GetID()) switch m := msg.(type) { case *types.AddrReq: self.discovery.AddrReqHandle(ctx) @@ -85,7 +85,7 @@ func (self *DiscoveryProtocol) HandlePeerMessage(ctx *p2p.Context, msg msgTypes. self.discovery.FindNodeHandle(ctx, m) default: msgType := msg.CmdType() - log.Warn("unknown message handler for the msg: ", msgType) + log4.Warn("unknown message handler for the msg: ", msgType) } } @@ -96,7 +96,7 @@ func TestDiscoveryNode(t *testing.T) { var nodes []*netserver.NetServer go seedNode.Start() seedAddr := seedNode.GetHostInfo().Addr - log.Errorf("seed addr: %s", seedAddr) + log4.Error("seed addr: %s", seedAddr) for i := 0; i < N; i++ { node := NewDiscoveryNode([]string{seedAddr}, net) net.AllowConnect(seedNode.GetHostInfo().Id, node.GetHostInfo().Id) @@ -110,7 +110,7 @@ func TestDiscoveryNode(t *testing.T) { assert.Equal(t, node.GetConnectionCnt(), uint32(1), fmt.Sprintf("node %d", i)) } - log.Info("start allow node connection") + log4.Info("start allow node connection") for i := 0; i < len(nodes); i++ { for j := i + 1; j < len(nodes); j++ { net.AllowConnect(nodes[i].GetHostInfo().Id, nodes[j].GetHostInfo().Id) diff --git a/p2pserver/mock/interface.go b/p2pserver/mock/interface.go index b40f959..0c6addf 100644 --- a/p2pserver/mock/interface.go +++ b/p2pserver/mock/interface.go @@ -22,11 +22,11 @@ import ( "net" "strconv" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/connect_controller" - "github.com/ontio/ontology/p2pserver/net/netserver" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/peer" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/connect_controller" + "github.com/ontio/ontology-tool/p2pserver/net/netserver" + p2p "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/peer" ) type Network interface { diff --git a/p2pserver/mock/listener.go b/p2pserver/mock/listener.go index 598e64c..e3a0dc8 100644 --- a/p2pserver/mock/listener.go +++ b/p2pserver/mock/listener.go @@ -22,7 +22,7 @@ import ( "errors" "net" - "github.com/ontio/ontology/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/common" ) type Listener struct { diff --git a/p2pserver/mock/mocknet.go b/p2pserver/mock/mocknet.go index 208e97e..eb81224 100644 --- a/p2pserver/mock/mocknet.go +++ b/p2pserver/mock/mocknet.go @@ -26,7 +26,7 @@ import ( "sync" "sync/atomic" - "github.com/ontio/ontology/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/common" ) func init() { diff --git a/p2pserver/mock/mocknet_test.go b/p2pserver/mock/mocknet_test.go index b0e970e..04a90c5 100644 --- a/p2pserver/mock/mocknet_test.go +++ b/p2pserver/mock/mocknet_test.go @@ -25,7 +25,7 @@ import ( "net" - "github.com/ontio/ontology/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/p2pserver/mock/reserved_test.go b/p2pserver/mock/reserved_test.go index d37f3dc..e440650 100644 --- a/p2pserver/mock/reserved_test.go +++ b/p2pserver/mock/reserved_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/net/netserver" - "github.com/ontio/ontology/p2pserver/peer" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/net/netserver" + "github.com/ontio/ontology-tool/p2pserver/peer" "github.com/stretchr/testify/assert" ) diff --git a/p2pserver/net/netserver/nbr_peers.go b/p2pserver/net/netserver/nbr_peers.go index 5e266c3..65d3c40 100644 --- a/p2pserver/net/netserver/nbr_peers.go +++ b/p2pserver/net/netserver/nbr_peers.go @@ -23,12 +23,12 @@ import ( "sync" "sync/atomic" - "github.com/ontio/ontology/p2pserver/peer" + "github.com/ontio/ontology-tool/p2pserver/peer" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/message/types" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/message/types" ) // Conn is a net.Conn wrapper to do some clean up when Close. @@ -50,11 +50,11 @@ func (self *Conn) Close() error { n := self.netServer.Np.List[self.id] if n.Peer == nil { - log.Fatalf("connection %s not in net server", self.id.ToHexString()) + log4.Crashf("connection %s not in net server", self.id.ToHexString()) } else if n.session == self.session { // connection not replaced delete(self.netServer.Np.List, self.id) // need handle asynchronously since we hold Np.Lock - log.Infof("remove peer %s from net server", self.id.ToHexString()) + log4.Info("remove peer %s from net server", self.id.ToHexString()) go self.netServer.notifyPeerDisconnected(n.Peer.Info) } diff --git a/p2pserver/net/netserver/netserver.go b/p2pserver/net/netserver/netserver.go index bccb8e5..f72b277 100644 --- a/p2pserver/net/netserver/netserver.go +++ b/p2pserver/net/netserver/netserver.go @@ -23,13 +23,13 @@ import ( "net" "time" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/connect_controller" + "github.com/ontio/ontology-tool/p2pserver/message/types" + p2p "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/peer" "github.com/ontio/ontology/common/config" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/connect_controller" - "github.com/ontio/ontology/p2pserver/message/types" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/peer" ) //NewNetServer return the net object in p2p @@ -86,7 +86,7 @@ func (this *NetServer) processMessage(channel chan *types.MsgPayload, if ok { sender := this.GetPeer(data.Id) if sender == nil { - log.Warnf("[router] remote peer %s invalid.", data.Id.ToHexString()) + log4.Warn("[router] remote peer %s invalid.", data.Id.ToHexString()) continue } @@ -106,7 +106,7 @@ func (this *NetServer) init(conf *config.P2PNodeConfig) error { httpInfo := conf.HttpInfoPort nodePort := conf.NodePort if nodePort == 0 { - log.Error("[p2p]link port invalid") + log4.Error("[p2p]link port invalid") return errors.New("[p2p]invalid link port") } @@ -121,16 +121,16 @@ func (this *NetServer) init(conf *config.P2PNodeConfig) error { syncPort := this.base.Port if syncPort == 0 { - log.Error("[p2p]sync port invalid") + log4.Error("[p2p]sync port invalid") return errors.New("[p2p]sync port invalid") } this.listener, err = connect_controller.NewListener(syncPort, config.DefConfig.P2PNode) if err != nil { - log.Error("[p2p]failed to create sync listener") + log4.Error("[p2p]failed to create sync listener") return errors.New("[p2p]failed to create sync listener") } - log.Infof("[p2p]init peer ID to %s", this.base.Id.ToHexString()) + log4.Info("[p2p]init peer ID to %s", this.base.Id.ToHexString()) return nil } @@ -139,10 +139,10 @@ func (this *NetServer) init(conf *config.P2PNodeConfig) error { func (this *NetServer) Start() error { this.protocol.HandleSystemMessage(this, p2p.NetworkStart{}) go this.startNetAccept(this.listener) - log.Infof("[p2p]start listen on sync port %d", this.base.Port) + log4.Info("[p2p]start listen on sync port %d", this.base.Port) go this.processMessage(this.NetChan, this.stopRecvCh) - log.Debug("[p2p]MessageRouter start to parse p2p message...") + log4.Debug("[p2p]MessageRouter start to parse p2p message...") return nil } @@ -208,7 +208,7 @@ func (this *NetServer) Send(p *peer.Peer, msg types.Message) error { if p != nil { return p.Send(msg) } - log.Warn("[p2p]sendMsg to a invalid peer") + log4.Warn("[p2p]sendMsg to a invalid peer") return errors.New("[p2p]sendMsg to a invalid peer") } @@ -216,7 +216,7 @@ func (this *NetServer) Send(p *peer.Peer, msg types.Message) error { func (this *NetServer) Connect(addr string) { err := this.connect(addr) if err != nil { - log.Debugf("%s connecting to %s failed, err: %s", this.base.Addr, addr, err) + log4.Debug("%s connecting to %s failed, err: %s", this.base.Addr, addr, err) } } @@ -278,13 +278,13 @@ func (this *NetServer) startNetAccept(listener net.Listener) { conn, err := listener.Accept() if err != nil { - log.Error("[p2p]error accepting ", err.Error()) + log4.Error("[p2p]error accepting ", err.Error()) return } go func() { if err := this.handleClientConnection(conn); err != nil { - log.Warnf("[p2p] client connect error: %s", err) + log4.Warn("[p2p] client connect error: %s", err) _ = conn.Close() } }() diff --git a/p2pserver/net/protocol/protocol.go b/p2pserver/net/protocol/protocol.go index ce67f16..3e90ac6 100644 --- a/p2pserver/net/protocol/protocol.go +++ b/p2pserver/net/protocol/protocol.go @@ -18,8 +18,8 @@ package p2p import ( - "github.com/ontio/ontology/p2pserver/message/types" - "github.com/ontio/ontology/p2pserver/peer" + "github.com/ontio/ontology-tool/p2pserver/message/types" + "github.com/ontio/ontology-tool/p2pserver/peer" ) type Context struct { diff --git a/p2pserver/net/protocol/server.go b/p2pserver/net/protocol/server.go index a0026e3..df0e3ff 100644 --- a/p2pserver/net/protocol/server.go +++ b/p2pserver/net/protocol/server.go @@ -20,9 +20,9 @@ package p2p import ( - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/message/types" - "github.com/ontio/ontology/p2pserver/peer" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/message/types" + "github.com/ontio/ontology-tool/p2pserver/peer" ) //P2P represent the net interface of p2p package diff --git a/p2pserver/p2pserver.go b/p2pserver/p2pserver.go index 20a5b56..61050c0 100644 --- a/p2pserver/p2pserver.go +++ b/p2pserver/p2pserver.go @@ -22,13 +22,13 @@ import ( "strings" "time" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/net/netserver" + p2pnet "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/protocols" "github.com/ontio/ontology/common/config" - "github.com/ontio/ontology/common/log" "github.com/ontio/ontology/core/ledger" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/net/netserver" - p2pnet "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/protocols" ) //P2PServer control all network activities @@ -72,7 +72,7 @@ func (this *P2PServer) GetNetwork() p2pnet.P2P { func (this *P2PServer) WaitForPeersStart() { periodTime := config.DEFAULT_GEN_BLOCK_TIME / common.UPDATE_RATE_PER_BLOCK for { - log.Info("[p2p]Wait for minimum connection...") + log4.Info("[p2p]Wait for minimum connection...") if this.reachMinConnection() { break } diff --git a/p2pserver/peer/peer.go b/p2pserver/peer/peer.go index b5675a9..6c09cb3 100644 --- a/p2pserver/peer/peer.go +++ b/p2pserver/peer/peer.go @@ -27,11 +27,11 @@ import ( "sync" "time" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + conn "github.com/ontio/ontology-tool/p2pserver/link" + "github.com/ontio/ontology-tool/p2pserver/message/types" comm "github.com/ontio/ontology/common" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - conn "github.com/ontio/ontology/p2pserver/link" - "github.com/ontio/ontology/p2pserver/message/types" ) // PeerInfo provides the basic information of a peer @@ -103,15 +103,15 @@ func (self *PeerInfo) String() string { //DumpInfo print all information of peer func (this *Peer) DumpInfo() { - log.Debug("[p2p]Node Info:") - log.Debug("[p2p]\t id = ", this.GetID()) - log.Debug("[p2p]\t addr = ", this.Info.Addr) - log.Debug("[p2p]\t version = ", this.GetVersion()) - log.Debug("[p2p]\t services = ", this.GetServices()) - log.Debug("[p2p]\t port = ", this.GetPort()) - log.Debug("[p2p]\t relay = ", this.GetRelay()) - log.Debug("[p2p]\t height = ", this.GetHeight()) - log.Debug("[p2p]\t softVersion = ", this.GetSoftVersion()) + log4.Debug("[p2p]Node Info:") + log4.Debug("[p2p]\t id = ", this.GetID()) + log4.Debug("[p2p]\t addr = ", this.Info.Addr) + log4.Debug("[p2p]\t version = ", this.GetVersion()) + log4.Debug("[p2p]\t services = ", this.GetServices()) + log4.Debug("[p2p]\t port = ", this.GetPort()) + log4.Debug("[p2p]\t relay = ", this.GetRelay()) + log4.Debug("[p2p]\t height = ", this.GetHeight()) + log4.Debug("[p2p]\t softVersion = ", this.GetSoftVersion()) } //GetVersion return peer`s version @@ -188,7 +188,7 @@ func (this *Peer) GetAddr16() ([16]byte, error) { } ip := net.ParseIP(addrIp).To16() if ip == nil { - log.Warn("[p2p]parse ip address error\n", this.GetAddr()) + log4.Warn("[p2p]parse ip address error\n", this.GetAddr()) return result, errors.New("[p2p]parse ip address error") } diff --git a/p2pserver/protocols/block_sync/block_sync.go b/p2pserver/protocols/block_sync/block_sync.go index 40ac946..1443bf0 100644 --- a/p2pserver/protocols/block_sync/block_sync.go +++ b/p2pserver/protocols/block_sync/block_sync.go @@ -24,14 +24,14 @@ import ( "sync" "time" + log4 "github.com/alecthomas/log4go" + p2pComm "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/message/msg_pack" + "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/peer" "github.com/ontio/ontology/common" - "github.com/ontio/ontology/common/log" "github.com/ontio/ontology/core/ledger" "github.com/ontio/ontology/core/types" - p2pComm "github.com/ontio/ontology/p2pserver/common" - msgpack "github.com/ontio/ontology/p2pserver/message/msg_pack" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/peer" ) const ( @@ -372,7 +372,7 @@ func (this *BlockSyncMgr) checkTimeout() { } flightInfo.ResetStartTime() flightInfo.MarkFailedNode() - log.Tracef("[p2p]checkTimeout sync headers from id:%d :%d timeout after:%d s Times:%d", flightInfo.GetNodeId(), height, SYNC_HEADER_REQUEST_TIMEOUT, flightInfo.GetTotalFailedTimes()) + log4.Trace("[p2p]checkTimeout sync headers from id:%d :%d timeout after:%d s Times:%d", flightInfo.GetNodeId(), height, SYNC_HEADER_REQUEST_TIMEOUT, flightInfo.GetTotalFailedTimes()) reqNode := this.getNodeWithMinFailedTimes(flightInfo, curBlockHeight) if reqNode == nil { break @@ -383,7 +383,7 @@ func (this *BlockSyncMgr) checkTimeout() { msg := msgpack.NewHeadersReq(headerHash) err := this.server.Send(reqNode, msg) if err != nil { - log.Warn("[p2p]checkTimeout failed to send a new headersReq:s", err) + log4.Warn("[p2p]checkTimeout failed to send a new headersReq:s", err) } else { this.appendReqTime(reqNode.GetID()) } @@ -397,7 +397,7 @@ func (this *BlockSyncMgr) checkTimeout() { } flightInfo.ResetStartTime() flightInfo.MarkFailedNode() - log.Tracef("[p2p]checkTimeout sync height:%d block:0x%x timeout after:%d s times:%d", flightInfo.Height, blockHash, SYNC_BLOCK_REQUEST_TIMEOUT, flightInfo.GetTotalFailedTimes()) + log4.Trace("[p2p]checkTimeout sync height:%d block:0x%x timeout after:%d s times:%d", flightInfo.Height, blockHash, SYNC_BLOCK_REQUEST_TIMEOUT, flightInfo.GetTotalFailedTimes()) reqNode := this.getNodeWithMinFailedTimes(flightInfo, curBlockHeight) if reqNode == nil { break @@ -407,7 +407,7 @@ func (this *BlockSyncMgr) checkTimeout() { msg := msgpack.NewBlkDataReq(blockHash) err := this.server.Send(reqNode, msg) if err != nil { - log.Warnf("[p2p]checkTimeout reqNode ID:%d Send error:%s", reqNode.GetID(), err) + log4.Warn("[p2p]checkTimeout reqNode ID:%d Send error:%s", reqNode.GetID(), err) continue } else { this.appendReqTime(reqNode.GetID()) @@ -451,12 +451,12 @@ func (this *BlockSyncMgr) syncHeader() { msg := msgpack.NewHeadersReq(headerHash) err := this.server.Send(reqNode, msg) if err != nil { - log.Warn("[p2p]syncHeader failed to send a new headersReq") + log4.Warn("[p2p]syncHeader failed to send a new headersReq") } else { this.appendReqTime(reqNode.GetID()) } - log.Infof("Header sync request height:%d", NextHeaderId) + log4.Info("Header sync request height:%d", NextHeaderId) } func (this *BlockSyncMgr) syncBlock() { @@ -519,7 +519,7 @@ func (this *BlockSyncMgr) syncBlock() { msg := msgpack.NewBlkDataReq(nextBlockHash) err := this.server.Send(reqNode, msg) if err != nil { - log.Warnf("[p2p]syncBlock Height:%d ReqBlkData error:%s", nextBlockHeight, err) + log4.Warn("[p2p]syncBlock Height:%d ReqBlkData error:%s", nextBlockHeight, err) return } else { this.appendReqTime(reqNode.GetID()) @@ -535,7 +535,7 @@ func (this *BlockSyncMgr) OnHeaderReceive(fromID p2pComm.PeerId, headers []*type if len(headers) == 0 { return } - log.Infof("Header receive height:%d - %d", headers[0].Height, headers[len(headers)-1].Height) + log4.Info("Header receive height:%d - %d", headers[0].Height, headers[len(headers)-1].Height) height := headers[0].Height curHeaderHeight := this.ledger.GetCurrentHeaderHeight() @@ -554,7 +554,7 @@ func (this *BlockSyncMgr) OnHeaderReceive(fromID p2pComm.PeerId, headers []*type if n != nil && n.GetErrorRespCnt() >= SYNC_MAX_ERROR_RESP_TIMES { this.delNode(fromID) } - log.Warnf("[p2p]OnHeaderReceive AddHeaders error:%s", err) + log4.Warn("[p2p]OnHeaderReceive AddHeaders error:%s", err) return } sort.Slice(headers, func(i, j int) bool { @@ -565,7 +565,7 @@ func (this *BlockSyncMgr) OnHeaderReceive(fromID p2pComm.PeerId, headers []*type for _, header := range headers { //handle empty block if header.TransactionsRoot == common.UINT256_EMPTY { - log.Trace("[p2p]OnHeaderReceive empty block Height:%d", header.Height) + log4.Trace("[p2p]OnHeaderReceive empty block Height:%d", header.Height) height := header.Height blockHash := header.Hash() this.delFlightBlock(blockHash) @@ -591,7 +591,7 @@ func (this *BlockSyncMgr) OnBlockReceive(fromID p2pComm.PeerId, blockSize uint32 merkleRoot common.Uint256) { height := block.Header.Height blockHash := block.Hash() - log.Tracef("[p2p]OnBlockReceive Height:%d", height) + log4.Trace("[p2p]OnBlockReceive Height:%d", height) flightInfo := this.getFlightBlock(blockHash, fromID) if flightInfo != nil { t := (time.Now().UnixNano() - flightInfo.GetStartTime().UnixNano()) / int64(time.Millisecond) @@ -617,7 +617,7 @@ func (this *BlockSyncMgr) OnBlockReceive(fromID p2pComm.PeerId, blockSize uint32 //OnAddPeer to node list when a new node added func (this *BlockSyncMgr) OnAddNode(nodeId p2pComm.PeerId) { - log.Debugf("[p2p]OnAddNode:%d", nodeId) + log4.Debug("[p2p]OnAddNode:%d", nodeId) this.lock.Lock() defer this.lock.Unlock() w := NewNodeWeight(nodeId) @@ -627,7 +627,7 @@ func (this *BlockSyncMgr) OnAddNode(nodeId p2pComm.PeerId) { //OnDelNode remove from node list. When the node disconnect func (this *BlockSyncMgr) OnDelNode(nodeId p2pComm.PeerId) { this.delNode(nodeId) - log.Infof("OnDelNode:%d", nodeId) + log4.Info("OnDelNode:%d", nodeId) } //delNode remove from node list @@ -635,11 +635,11 @@ func (this *BlockSyncMgr) delNode(nodeId p2pComm.PeerId) { this.lock.Lock() defer this.lock.Unlock() delete(this.nodeWeights, nodeId) - log.Infof("delNode:%d", nodeId) + log4.Info("delNode:%d", nodeId) if len(this.nodeWeights) == 0 { - log.Warnf("no sync nodes") + log4.Warn("no sync nodes") } - log.Infof("OnDelNode:%d", nodeId) + log4.Info("OnDelNode:%d", nodeId) } func (this *BlockSyncMgr) tryGetSyncHeaderLock() bool { @@ -731,7 +731,7 @@ func (this *BlockSyncMgr) saveBlock() { if n != nil && n.GetErrorRespCnt() >= SYNC_MAX_ERROR_RESP_TIMES { this.delNode(fromID) } - log.Warnf("[p2p]saveBlock Height:%d AddBlock error:%s", nextBlockHeight, err) + log4.Warn("[p2p]saveBlock Height:%d AddBlock error:%s", nextBlockHeight, err) reqNode := this.getNextNode(nextBlockHeight) if reqNode == nil { return @@ -740,7 +740,7 @@ func (this *BlockSyncMgr) saveBlock() { msg := msgpack.NewBlkDataReq(nextBlock.Hash()) err := this.server.Send(reqNode, msg) if err != nil { - log.Warn("[p2p]require new block error:", err) + log4.Warn("[p2p]require new block error:", err) return } else { this.appendReqTime(reqNode.GetID()) diff --git a/p2pserver/protocols/bootstrap/bootstrap.go b/p2pserver/protocols/bootstrap/bootstrap.go index 22bcb25..9daf7f5 100644 --- a/p2pserver/protocols/bootstrap/bootstrap.go +++ b/p2pserver/protocols/bootstrap/bootstrap.go @@ -23,12 +23,12 @@ import ( "strconv" "time" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - msgpack "github.com/ontio/ontology/p2pserver/message/msg_pack" - "github.com/ontio/ontology/p2pserver/message/types" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/peer" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + msgpack "github.com/ontio/ontology-tool/p2pserver/message/msg_pack" + "github.com/ontio/ontology-tool/p2pserver/message/types" + p2p "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/peer" ) const activeConnect = 4 // when connection num less than this value, we connect seeds node actively. @@ -90,17 +90,17 @@ func (self *BootstrapService) connectSeeds() { for _, n := range self.seeds { ip, err := common.ParseIPAddr(n) if err != nil { - log.Warnf("[p2p]seed peer %s address format is wrong", n) + log4.Warn("[p2p]seed peer %s address format is wrong", n) continue } ns, err := net.LookupHost(ip) if err != nil { - log.Warnf("[p2p]resolve err: %s", err.Error()) + log4.Warn("[p2p]resolve err: %s", err.Error()) continue } port, err := common.ParseIPPort(n) if err != nil { - log.Warnf("[p2p]seed peer %s address format is wrong", n) + log4.Warn("[p2p]seed peer %s address format is wrong", n) continue } seedNodes = append(seedNodes, ns[0]+port) diff --git a/p2pserver/protocols/discovery/discovery.go b/p2pserver/protocols/discovery/discovery.go index 643ef97..bf12b9f 100644 --- a/p2pserver/protocols/discovery/discovery.go +++ b/p2pserver/protocols/discovery/discovery.go @@ -23,13 +23,13 @@ import ( "strconv" "time" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - "github.com/ontio/ontology/p2pserver/dht" - msgpack "github.com/ontio/ontology/p2pserver/message/msg_pack" - "github.com/ontio/ontology/p2pserver/message/types" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/peer" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/dht" + msgpack "github.com/ontio/ontology-tool/p2pserver/message/msg_pack" + "github.com/ontio/ontology-tool/p2pserver/message/types" + p2p "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/peer" "github.com/scylladb/go-set/strset" ) @@ -79,10 +79,10 @@ func (self *Discovery) findSelf() { for { select { case <-tick.C: - log.Debug("[dht] start to find myself") + log4.Debug("[dht] start to find myself") closer := self.dht.BetterPeers(self.id, dht.AlphaValue) for _, curPair := range closer { - log.Debugf("[dht] find closr peer %s", curPair.ID.ToHexString()) + log4.Debug("[dht] find closr peer %s", curPair.ID.ToHexString()) var msg types.Message if curPair.ID.IsPseudoPeerId() { @@ -105,11 +105,11 @@ func (self *Discovery) refreshCPL() { select { case <-tick.C: for curCPL := range self.dht.RouteTable().Buckets { - log.Debugf("[dht] start to refresh bucket: %d", curCPL) + log4.Debug("[dht] start to refresh bucket: %d", curCPL) randPeer := self.dht.RouteTable().GenRandKadId(uint(curCPL)) closer := self.dht.BetterPeers(randPeer, dht.AlphaValue) for _, pair := range closer { - log.Debugf("[dht] find closr peer %s", pair.ID.ToHexString()) + log4.Debug("[dht] find closr peer %s", pair.ID.ToHexString()) var msg types.Message if pair.ID.IsPseudoPeerId() { msg = msgpack.NewAddrReq() @@ -131,7 +131,7 @@ func (self *Discovery) FindNodeHandle(ctx *p2p.Context, freq *types.FindNodeReq) var fresp types.FindNodeResp // check the target is my self - log.Debugf("[dht] find node for peerid: %d", freq.TargetID) + log4.Debug("[dht] find node for peerid: %d", freq.TargetID) if freq.TargetID == self.id { fresp.Success = true @@ -139,7 +139,7 @@ func (self *Discovery) FindNodeHandle(ctx *p2p.Context, freq *types.FindNodeReq) // you've already connected with me so there's no need to give you my address // omit the address if err := remotePeer.Send(&fresp); err != nil { - log.Warn(err) + log4.Warn(err) } return } @@ -173,19 +173,19 @@ func (self *Discovery) FindNodeHandle(ctx *p2p.Context, freq *types.FindNodeReq) fresp.CloserPeers = mskedAddrs } - log.Debugf("[dht] find %d more closer peers:", len(fresp.CloserPeers)) + log4.Debug("[dht] find %d more closer peers:", len(fresp.CloserPeers)) for _, curpa := range fresp.CloserPeers { - log.Debugf(" dht: pid: %s, addr: %s", curpa.ID.ToHexString(), curpa.Address) + log4.Debug(" dht: pid: %s, addr: %s", curpa.ID.ToHexString(), curpa.Address) } if err := remotePeer.Send(&fresp); err != nil { - log.Warn(err) + log4.Warn(err) } } func (self *Discovery) FindNodeResponseHandle(ctx *p2p.Context, fresp *types.FindNodeResp) { if fresp.Success { - log.Debugf("[p2p dht] %s", "find peer success, do nothing") + log4.Debug("[p2p dht] %s", "find peer success, do nothing") return } p2p := ctx.Network() @@ -199,7 +199,7 @@ func (self *Discovery) FindNodeResponseHandle(ctx *p2p.Context, fresp *types.Fin if curpa.ID == p2p.GetID() { continue } - log.Debugf("[dht] try to connect to another peer by dht: %s ==> %s", curpa.ID.ToHexString(), curpa.Address) + log4.Debug("[dht] try to connect to another peer by dht: %s ==> %s", curpa.ID.ToHexString(), curpa.Address) go p2p.Connect(curpa.Address) } } @@ -268,7 +268,7 @@ func (self *Discovery) AddrReqHandle(ctx *p2p.Context) { err := remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } } @@ -286,7 +286,7 @@ func (self *Discovery) AddrHandle(ctx *p2p.Context, msg *types.Addr) { continue } - log.Debug("[p2p]connect ip address:", address) + log4.Debug("[p2p]connect ip address:", address) go p2p.Connect(address) } } diff --git a/p2pserver/protocols/heatbeat/heartbeat.go b/p2pserver/protocols/heatbeat/heartbeat.go index 0cc7709..b90dd1c 100644 --- a/p2pserver/protocols/heatbeat/heartbeat.go +++ b/p2pserver/protocols/heatbeat/heartbeat.go @@ -20,13 +20,13 @@ package heatbeat import ( "time" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + msgpack "github.com/ontio/ontology-tool/p2pserver/message/msg_pack" + "github.com/ontio/ontology-tool/p2pserver/message/types" + p2p "github.com/ontio/ontology-tool/p2pserver/net/protocol" "github.com/ontio/ontology/common/config" - "github.com/ontio/ontology/common/log" "github.com/ontio/ontology/core/ledger" - "github.com/ontio/ontology/p2pserver/common" - msgpack "github.com/ontio/ontology/p2pserver/message/msg_pack" - "github.com/ontio/ontology/p2pserver/message/types" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" ) type HeartBeat struct { @@ -82,7 +82,7 @@ func (this *HeartBeat) timeout() { t := p.GetContactTime() if t.Before(time.Now().Add(-1 * time.Second * time.Duration(periodTime) * common.KEEPALIVE_TIMEOUT)) { - log.Warnf("[p2p]keep alive timeout!!!lost remote peer %d - %s from %s", p.GetID(), p.Link.GetAddr(), t.String()) + log4.Warn("[p2p]keep alive timeout!!!lost remote peer %d - %s from %s", p.GetID(), p.Link.GetAddr(), t.String()) p.Close() } } @@ -99,7 +99,7 @@ func (this *HeartBeat) PingHandle(ctx *p2p.Context, ping *types.Ping) { err := remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) } } diff --git a/p2pserver/protocols/msg_handler.go b/p2pserver/protocols/msg_handler.go index 1b058f7..2413a98 100644 --- a/p2pserver/protocols/msg_handler.go +++ b/p2pserver/protocols/msg_handler.go @@ -23,23 +23,23 @@ import ( "fmt" "strconv" - lru "github.com/hashicorp/golang-lru" + log4 "github.com/alecthomas/log4go" + "github.com/hashicorp/golang-lru" + actor "github.com/ontio/ontology-tool/p2pserver/actor/req" + msgCommon "github.com/ontio/ontology-tool/p2pserver/common" + "github.com/ontio/ontology-tool/p2pserver/message/msg_pack" + msgTypes "github.com/ontio/ontology-tool/p2pserver/message/types" + "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/protocols/block_sync" + "github.com/ontio/ontology-tool/p2pserver/protocols/bootstrap" + "github.com/ontio/ontology-tool/p2pserver/protocols/discovery" + "github.com/ontio/ontology-tool/p2pserver/protocols/heatbeat" + "github.com/ontio/ontology-tool/p2pserver/protocols/recent_peers" + "github.com/ontio/ontology-tool/p2pserver/protocols/reconnect" "github.com/ontio/ontology/common" "github.com/ontio/ontology/common/config" - "github.com/ontio/ontology/common/log" "github.com/ontio/ontology/core/ledger" "github.com/ontio/ontology/core/types" - actor "github.com/ontio/ontology/p2pserver/actor/req" - msgCommon "github.com/ontio/ontology/p2pserver/common" - msgpack "github.com/ontio/ontology/p2pserver/message/msg_pack" - msgTypes "github.com/ontio/ontology/p2pserver/message/types" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/protocols/block_sync" - "github.com/ontio/ontology/p2pserver/protocols/bootstrap" - "github.com/ontio/ontology/p2pserver/protocols/discovery" - "github.com/ontio/ontology/p2pserver/protocols/heatbeat" - "github.com/ontio/ontology/p2pserver/protocols/recent_peers" - "github.com/ontio/ontology/p2pserver/protocols/reconnect" ) //respCache cache for some response data @@ -110,7 +110,7 @@ func (self *MsgHandler) HandleSystemMessage(net p2p.P2P, msg p2p.SystemMessage) } func (self *MsgHandler) HandlePeerMessage(ctx *p2p.Context, msg msgTypes.Message) { - log.Trace("[p2p]receive message", ctx.Sender().GetAddr(), ctx.Sender().GetID()) + log4.Trace("[p2p]receive message", ctx.Sender().GetAddr(), ctx.Sender().GetID()) switch m := msg.(type) { case *msgTypes.AddrReq: self.discovery.AddrReqHandle(ctx) @@ -139,13 +139,13 @@ func (self *MsgHandler) HandlePeerMessage(ctx *p2p.Context, msg msgTypes.Message case *msgTypes.Inv: InvHandle(ctx, m) case *msgTypes.NotFound: - log.Debug("[p2p]receive notFound message, hash is ", m.Hash) + log4.Debug("[p2p]receive notFound message, hash is ", m.Hash) default: msgType := msg.CmdType() if msgType == msgCommon.VERACK_TYPE || msgType == msgCommon.VERSION_TYPE { - log.Infof("receive message: %s from peer %s", msgType, ctx.Sender().GetAddr()) + log4.Info("receive message: %s from peer %s", msgType, ctx.Sender().GetAddr()) } else { - log.Warn("unknown message handler for the msg: ", msgType) + log4.Warn("unknown message handler for the msg: ", msgType) } } } @@ -157,14 +157,14 @@ func HeadersReqHandle(ctx *p2p.Context, headersReq *msgTypes.HeadersReq) { headers, err := GetHeadersFromHash(startHash, stopHash) if err != nil { - log.Warnf("HeadersReqHandle error: %s,startHash:%s,stopHash:%s", err.Error(), startHash.ToHexString(), stopHash.ToHexString()) + log4.Warn("HeadersReqHandle error: %s,startHash:%s,stopHash:%s", err.Error(), startHash.ToHexString(), stopHash.ToHexString()) return } remotePeer := ctx.Sender() msg := msgpack.NewHeaders(headers) err = remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } } @@ -185,7 +185,7 @@ func (self *MsgHandler) blockHandle(ctx *p2p.Context, block *msgTypes.Block) { func ConsensusHandle(ctx *p2p.Context, consensus *msgTypes.Consensus) { if actor.ConsensusPid != nil { if err := consensus.Cons.Verify(); err != nil { - log.Warn(err) + log4.Warn(err) return } consensus.Cons.PeerId = ctx.Sender().GetID() @@ -199,7 +199,7 @@ func TransactionHandle(ctx *p2p.Context, trn *msgTypes.Trn) { txCache.Add(trn.Txn.Hash(), nil) actor.AddTransaction(trn.Txn) } else { - log.Tracef("[p2p]receive duplicate Transaction message, txHash: %x\n", trn.Txn.Hash()) + log4.Trace("[p2p]receive duplicate Transaction message, txHash: %x\n", trn.Txn.Hash()) } } @@ -223,35 +223,35 @@ func DataReqHandle(ctx *p2p.Context, dataReq *msgTypes.DataReq) { var merkleRoot common.Uint256 block, err := ledger.DefLedger.GetBlockByHash(hash) if err != nil || block == nil || block.Header == nil { - log.Debug("[p2p]can't get block by hash: ", hash, " ,send not found message") + log4.Debug("[p2p]can't get block by hash: ", hash, " ,send not found message") msg := msgpack.NewNotFound(hash) err := remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } return } ccMsg, err := ledger.DefLedger.GetCrossChainMsg(block.Header.Height - 1) if err != nil { - log.Debugf("[p2p]failed to get cross chain message at height %v, err %v", + log4.Debug("[p2p]failed to get cross chain message at height %v, err %v", block.Header.Height-1, err) msg := msgpack.NewNotFound(hash) err := remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } return } merkleRoot, err = ledger.DefLedger.GetStateMerkleRoot(block.Header.Height) if err != nil { - log.Debugf("[p2p]failed to get state merkel root at height %v, err %v", + log4.Debug("[p2p]failed to get state merkel root at height %v, err %v", block.Header.Height, err) msg := msgpack.NewNotFound(hash) err := remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } return @@ -261,26 +261,26 @@ func DataReqHandle(ctx *p2p.Context, dataReq *msgTypes.DataReq) { } err := remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } case common.TRANSACTION: txn, err := ledger.DefLedger.GetTransaction(hash) if err != nil { - log.Debug("[p2p]Can't get transaction by hash: ", + log4.Debug("[p2p]Can't get transaction by hash: ", hash, " ,send not found message") msg := msgpack.NewNotFound(hash) err = remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } } msg := msgpack.NewTxn(txn) err = remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } } @@ -291,18 +291,18 @@ func DataReqHandle(ctx *p2p.Context, dataReq *msgTypes.DataReq) { func InvHandle(ctx *p2p.Context, inv *msgTypes.Inv) { remotePeer := ctx.Sender() if len(inv.P.Blk) == 0 { - log.Debug("[p2p]empty inv payload in InvHandle") + log4.Debug("[p2p]empty inv payload in InvHandle") return } var id common.Uint256 str := inv.P.Blk[0].ToHexString() - log.Debugf("[p2p]the inv type: 0x%x block len: %d, %s\n", + log4.Debug("[p2p]the inv type: 0x%x block len: %d, %s\n", inv.P.InvType, len(inv.P.Blk), str) invType := common.InventoryType(inv.P.InvType) switch invType { case common.TRANSACTION: - log.Debug("[p2p]receive transaction message", id) + log4.Debug("[p2p]receive transaction message", id) // TODO check the ID queue id = inv.P.Blk[0] trn, err := ledger.DefLedger.GetTransaction(id) @@ -310,43 +310,43 @@ func InvHandle(ctx *p2p.Context, inv *msgTypes.Inv) { msg := msgpack.NewTxnDataReq(id) err = remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } } case common.BLOCK: - log.Debug("[p2p]receive block message") + log4.Debug("[p2p]receive block message") for _, id = range inv.P.Blk { - log.Debug("[p2p]receive inv-block message, hash is ", id) + log4.Debug("[p2p]receive inv-block message, hash is ", id) // TODO check the ID queue isContainBlock, err := ledger.DefLedger.IsContainBlock(id) if err != nil { - log.Warn(err) + log4.Warn(err) return } if !isContainBlock && msgTypes.LastInvHash != id { msgTypes.LastInvHash = id // send the block request - log.Infof("[p2p]inv request block hash: %x", id) + log4.Info("[p2p]inv request block hash: %x", id) msg := msgpack.NewBlkDataReq(id) err = remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } } } case common.CONSENSUS: - log.Debug("[p2p]receive consensus message") + log4.Debug("[p2p]receive consensus message") id = inv.P.Blk[0] msg := msgpack.NewConsensusDataReq(id) err := remotePeer.Send(msg) if err != nil { - log.Warn(err) + log4.Warn(err) return } default: - log.Warn("[p2p]receive unknown inventory message") + log4.Warn("[p2p]receive unknown inventory message") } } @@ -414,7 +414,7 @@ func GetHeadersFromHash(startHash common.Uint256, stopHash common.Uint256) ([]*t hash := ledger.DefLedger.GetBlockHash(stopHeight + i) header, err := ledger.DefLedger.GetHeaderByHash(hash) if err != nil { - log.Debugf("[p2p]net_server GetBlockWithHeight failed with err=%s, hash=%x,height=%d\n", err.Error(), hash, stopHeight+i) + log4.Debug("[p2p]net_server GetBlockWithHeight failed with err=%s, hash=%x,height=%d\n", err.Error(), hash, stopHeight+i) return nil, err } diff --git a/p2pserver/protocols/recent_peers/recent_peers.go b/p2pserver/protocols/recent_peers/recent_peers.go index 79fce11..cb6101d 100644 --- a/p2pserver/protocols/recent_peers/recent_peers.go +++ b/p2pserver/protocols/recent_peers/recent_peers.go @@ -24,11 +24,11 @@ import ( "sync" "time" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + p2p "github.com/ontio/ontology-tool/p2pserver/net/protocol" common2 "github.com/ontio/ontology/common" "github.com/ontio/ontology/common/config" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" ) type PersistRecentPeerService struct { @@ -93,12 +93,12 @@ func (this *PersistRecentPeerService) saveToFile() { } buf, err := json.Marshal(temp) if err != nil { - log.Warn("[p2p]package recent peer fail: ", err) + log4.Warn("[p2p]package recent peer fail: ", err) return } err = ioutil.WriteFile(common.RECENT_FILE_NAME, buf, os.ModePerm) if err != nil { - log.Warn("[p2p]write recent peer fail: ", err) + log4.Warn("[p2p]write recent peer fail: ", err) } } @@ -118,14 +118,14 @@ func (this *PersistRecentPeerService) loadRecentPeers() { if common2.FileExisted(common.RECENT_FILE_NAME) { buf, err := ioutil.ReadFile(common.RECENT_FILE_NAME) if err != nil { - log.Warn("[p2p]read %s fail:%s, connect recent peers cancel", common.RECENT_FILE_NAME, err.Error()) + log4.Warn("[p2p]read %s fail:%s, connect recent peers cancel", common.RECENT_FILE_NAME, err.Error()) return } temp := make(map[uint32][]string) err = json.Unmarshal(buf, &temp) if err != nil { - log.Warn("[p2p]parse recent peer file fail: ", err) + log4.Warn("[p2p]parse recent peer file fail: ", err) return } for networkId, addrs := range temp { @@ -149,7 +149,7 @@ func (this *PersistRecentPeerService) Start() { func (this *PersistRecentPeerService) tryRecentPeers() { netID := config.DefConfig.P2PNode.NetworkMagic if len(this.recentPeers[netID]) > 0 { - log.Info("[p2p] try to connect recent peer") + log4.Info("[p2p] try to connect recent peer") } for _, v := range this.recentPeers[netID] { go this.net.Connect(v.Addr) diff --git a/p2pserver/protocols/reconnect/reconnect.go b/p2pserver/protocols/reconnect/reconnect.go index 0d104bc..afc6c56 100644 --- a/p2pserver/protocols/reconnect/reconnect.go +++ b/p2pserver/protocols/reconnect/reconnect.go @@ -25,11 +25,11 @@ import ( "sync" "time" + log4 "github.com/alecthomas/log4go" + "github.com/ontio/ontology-tool/p2pserver/common" + p2p "github.com/ontio/ontology-tool/p2pserver/net/protocol" + "github.com/ontio/ontology-tool/p2pserver/peer" "github.com/ontio/ontology/common/config" - "github.com/ontio/ontology/common/log" - "github.com/ontio/ontology/p2pserver/common" - p2p "github.com/ontio/ontology/p2pserver/net/protocol" - "github.com/ontio/ontology/p2pserver/peer" ) //ReconnectService contain addr need to reconnect @@ -83,7 +83,7 @@ func getPeerListenAddr(p *peer.PeerInfo) (string, error) { func (self *ReconnectService) OnAddPeer(p *peer.PeerInfo) { nodeAddr, err := getPeerListenAddr(p) if err != nil { - log.Errorf("failed to parse addr: %s", p.Addr) + log4.Error("failed to parse addr: %s", p.Addr) return } self.Lock() @@ -94,7 +94,7 @@ func (self *ReconnectService) OnAddPeer(p *peer.PeerInfo) { func (self *ReconnectService) OnDelPeer(p *peer.PeerInfo) { nodeAddr, err := getPeerListenAddr(p) if err != nil { - log.Errorf("failed to parse addr: %s", p.Addr) + log4.Error("failed to parse addr: %s", p.Addr) return } self.Lock() @@ -106,7 +106,7 @@ func (this *ReconnectService) retryInactivePeer() { net := this.net connCount := net.GetOutConnRecordLen() if connCount >= config.DefConfig.P2PNode.MaxConnOutBound { - log.Warnf("[p2p]Connect: out connections(%d) reach max limit(%d)", connCount, + log4.Warn("[p2p]Connect: out connections(%d) reach max limit(%d)", connCount, config.DefConfig.P2PNode.MaxConnOutBound) return } @@ -129,9 +129,9 @@ func (this *ReconnectService) retryInactivePeer() { this.Unlock() for _, addr := range addrs { rand.Seed(time.Now().UnixNano()) - log.Debug("[p2p]Try to reconnect peer, peer addr is ", addr) + log4.Debug("[p2p]Try to reconnect peer, peer addr is ", addr) <-time.After(time.Duration(rand.Intn(common.CONN_MAX_BACK)) * time.Millisecond) - log.Debug("[p2p]Back off time`s up, start connect node") + log4.Debug("[p2p]Back off time`s up, start connect node") net.Connect(addr) } }