From b30d72501cfb57f4937b72ff4a8c1826a3e27a79 Mon Sep 17 00:00:00 2001 From: Age Manning Date: Tue, 19 Mar 2019 21:55:57 +1100 Subject: [PATCH] Add logger to sync module --- beacon_node/network/src/message_handler.rs | 2 +- beacon_node/network/src/sync/simple_sync.rs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/beacon_node/network/src/message_handler.rs b/beacon_node/network/src/message_handler.rs index 3b95c1263d..bf0df1aa6a 100644 --- a/beacon_node/network/src/message_handler.rs +++ b/beacon_node/network/src/message_handler.rs @@ -65,7 +65,7 @@ impl MessageHandler { // Initialise sync and begin processing in thread // generate the Message handler - let sync = SimpleSync::new(beacon_chain.clone()); + let sync = SimpleSync::new(beacon_chain.clone(), &log); let mut handler = MessageHandler { // TODO: The handler may not need a chain, perhaps only sync? diff --git a/beacon_node/network/src/sync/simple_sync.rs b/beacon_node/network/src/sync/simple_sync.rs index 2a3cc70892..50f6f4a504 100644 --- a/beacon_node/network/src/sync/simple_sync.rs +++ b/beacon_node/network/src/sync/simple_sync.rs @@ -1,6 +1,7 @@ use crate::beacon_chain::BeaconChain; use libp2p::rpc::HelloMessage; use libp2p::PeerId; +use slog::{debug, o}; use std::collections::HashMap; use std::sync::Arc; use types::{Epoch, Hash256, Slot}; @@ -36,11 +37,14 @@ pub struct SimpleSync { latest_finalized_epoch: Epoch, /// The latest block of the syncing chain. latest_block: Hash256, + /// Sync logger. + log: slog::Logger, } impl SimpleSync { - pub fn new(beacon_chain: Arc) -> Self { + pub fn new(beacon_chain: Arc, log: &slog::Logger) -> Self { let state = beacon_chain.get_state(); + let sync_logger = log.new(o!("Service"=> "Sync")); SimpleSync { chain: beacon_chain.clone(), known_peers: HashMap::new(), @@ -48,6 +52,7 @@ impl SimpleSync { network_id: beacon_chain.get_spec().network_id, latest_finalized_epoch: state.finalized_epoch, latest_block: state.finalized_root, //TODO: Build latest block function into Beacon chain and correct this + log: sync_logger, } } @@ -87,7 +92,9 @@ impl SimpleSync { best_slot: hello_message.best_slot, }; + debug!(self.log, "Handshake successful. Peer: {:?}", peer_id); self.known_peers.insert(peer_id, peer_info); + //TODO: Start syncing true