status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restore compilation with trace-level logging; Fixes #642

This commit is contained in:
Zahary Karadjov 2019-12-13 17:33:20 +02:00 committed by zah
parent 095b271bd4
commit 7e356b3fa6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_chain/eth2_network.nim
View File

@ -311,16 +311,16 @@ else:
proc subscribe*[MsgType](node: Eth2Node, proc subscribe*[MsgType](node: Eth2Node,
topic: string, topic: string,
msgHandler: proc(msg: MsgType) {.gcsafe.} ) {.async, gcsafe.} = msgHandler: proc(msg: MsgType) {.gcsafe.} ) {.async, gcsafe.} =
template execMsgHandler(gossipBytes, gossipTopic) = template execMsgHandler(peerExpr, gossipBytes, gossipTopic) =
inc gossip_messages_received inc gossip_messages_received
trace "Incoming gossip bytes", trace "Incoming gossip bytes",
peer = msg.peer, len = gossipBytes.len, topic = gossipTopic peer = peerExpr, len = gossipBytes.len, topic = gossipTopic
msgHandler SSZ.decode(gossipBytes, MsgType) msgHandler SSZ.decode(gossipBytes, MsgType)
when networkBackend == libp2p: when networkBackend == libp2p:
let incomingMsgHandler = proc(topic: string, let incomingMsgHandler = proc(topic: string,
data: seq[byte]) {.async, gcsafe.} = data: seq[byte]) {.async, gcsafe.} =
execMsgHandler data, topic execMsgHandler "unknown", data, topic
await node.switch.subscribe(topic, incomingMsgHandler) await node.switch.subscribe(topic, incomingMsgHandler)
@ -328,7 +328,7 @@ else:
let incomingMsgHandler = proc(api: DaemonAPI, let incomingMsgHandler = proc(api: DaemonAPI,
ticket: PubsubTicket, ticket: PubsubTicket,
msg: PubSubMessage): Future[bool] {.async, gcsafe.} = msg: PubSubMessage): Future[bool] {.async, gcsafe.} =
execMsgHandler msg.data, msg.topics[0] execMsgHandler msg.peer, msg.data, msg.topics[0]
return true return true
discard await node.daemon.pubsubSubscribe(topic, incomingMsgHandler) discard await node.daemon.pubsubSubscribe(topic, incomingMsgHandler)