Skip to content

Commit a37b68a

Browse files
Use slog in receivePeerInfo and revert use of mplex (#10)
* Use slog in receivePeerInfo * Revert "Use mplex muxer (#4)" This reverts commit 0472b96. * Fix logging in receivePeerInfo --------- Co-authored-by: neeraj <[email protected]>
1 parent 235dca8 commit a37b68a

3 files changed

Lines changed: 5 additions & 9 deletions

File tree

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ require (
7878
github.com/libp2p/go-libp2p-asn-util v0.3.0 // indirect
7979
github.com/libp2p/go-libp2p-kbucket v0.6.3 // indirect
8080
github.com/libp2p/go-libp2p-record v0.2.0 // indirect
81-
github.com/libp2p/go-mplex v0.7.0 // indirect
8281
github.com/libp2p/go-msgio v0.3.0 // indirect
8382
github.com/libp2p/go-nat v0.2.0 // indirect
8483
github.com/libp2p/go-netroute v0.2.1 // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,6 @@ github.com/libp2p/go-libp2p-record v0.2.0 h1:oiNUOCWno2BFuxt3my4i1frNrt7PerzB3qu
495495
github.com/libp2p/go-libp2p-record v0.2.0/go.mod h1:I+3zMkvvg5m2OcSdoL0KPljyJyvNDFGKX7QdlpYUcwk=
496496
github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
497497
github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg=
498-
github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
499-
github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
500498
github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
501499
github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
502500
github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=

node/engine/messageservice/p2p-message-service/service.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/libp2p/go-libp2p/core/network"
1818
"github.com/libp2p/go-libp2p/core/peer"
1919
"github.com/libp2p/go-libp2p/core/protocol"
20-
"github.com/libp2p/go-libp2p/p2p/muxer/mplex"
2120
"github.com/libp2p/go-libp2p/p2p/transport/tcp"
2221
"github.com/libp2p/go-libp2p/p2p/transport/websocket"
2322
"github.com/multiformats/go-multiaddr"
@@ -95,7 +94,7 @@ func NewMessageService(ip string, tcpPort int, wsPort int, me types.Address, pk
9594
libp2p.EnableNATService(),
9695
libp2p.Transport(websocket.New),
9796
// libp2p.NoSecurity, // Use default security options (Noise + TLS)
98-
libp2p.Muxer(mplex.ID, mplex.DefaultTransport),
97+
libp2p.DefaultMuxers,
9998
}
10099
host, err := libp2p.New(options...)
101100
if err != nil {
@@ -239,7 +238,7 @@ func (ms *P2PMessageService) msgStreamHandler(stream network.Stream) {
239238

240239
// receivePeerInfo receives peer info from the given stream
241240
func (ms *P2PMessageService) receivePeerInfo(stream network.Stream) {
242-
ms.logger.Debug().Msgf("received peerInfo")
241+
ms.logger.Info("received peerInfo")
243242
defer stream.Close()
244243

245244
// Create a buffer stream for non blocking read and write.
@@ -251,21 +250,21 @@ func (ms *P2PMessageService) receivePeerInfo(stream network.Stream) {
251250
return
252251
}
253252
if err != nil {
254-
ms.logger.Err(err)
253+
ms.logger.Error("error", "err", err)
255254
return
256255
}
257256

258257
var msg *basicPeerInfo
259258
err = json.Unmarshal([]byte(raw), &msg)
260259
if err != nil {
261-
ms.logger.Err(err)
260+
ms.logger.Error("error in unmarshalling", "err", err)
262261
return
263262
}
264263

265264
_, foundPeer := ms.peers.LoadOrStore(msg.Address.String(), msg.Id)
266265
if !foundPeer {
267266
peerInfo := basicPeerInfo{msg.Id, msg.Address}
268-
ms.logger.Debug().Msgf("stored new peer in map: %v", peerInfo)
267+
ms.logger.Info("stored new peer in map", "peerInfo", peerInfo)
269268
ms.newPeerInfo <- peerInfo
270269
}
271270
}

0 commit comments

Comments
 (0)