3bedb44 node: Fix a few logging-related things — heartwood

Radicle Heartwood Protocol & Stack

node: Fix a few logging-related things

Alexis Sellier committed 3 years ago

commit 3bedb4438e511faec67b14e199cc27a24e5e2ce5
parent 97d4729fa47d6d2026538ad711e6ac07b9170b46

3 files changed +14 -6

modified radicle-node/Cargo.toml

@@ -24,7 +24,7 @@ log = { version = "0.4.17", features = ["std"] }

 nakamoto-net = { version = "0.3.0" }
 netservices = { version = "0", features = ["io-reactor", "socket2", "log"] }
 nonempty = { version = "0.8.1", features = ["serialize"] }
 io-reactor = { version = "0", features = ["popol", "socket2", "log"] }
 io-reactor = { version = "0", features = ["popol", "socket2"] }
 qcheck = { version = "1", default-features = false, optional = true }
 sqlite = { version = "0.30.3" }
 sqlite3-src = { version = "0.4.0", features = ["bundled"] } # Ensures static linking

modified radicle-node/src/service/reactor.rs

@@ -80,9 +80,14 @@ impl Reactor {

     pub fn write_all(&mut self, remote: NodeId, msgs: impl IntoIterator<Item = Message>) {
         let msgs = msgs.into_iter().collect::<Vec<_>>();
         let len = msgs.len();
         for (no, msg) in msgs.iter().enumerate() {
             debug!("Write {no}/{len} {:?} message to {}", msg, remote);
         for (ix, msg) in msgs.iter().enumerate() {
             debug!(
                 "Write {:?} message to {} ({}/{})",
                 msg,
                 remote,
                 ix + 1,
                 msgs.len()
             );
         }
         self.io.push_back(Io::Write(remote, msgs));
     }

modified radicle-node/src/wire/protocol.rs

@@ -31,8 +31,11 @@ use crate::worker::{WorkerReq, WorkerResp};

 use crate::Link;
 use crate::{address, service};
 /// Peer session type.
 pub type WireSession<G> = CypherSession<G, Sha256>;
 /// Peer session type (read-only).
 pub type WireReader = CypherReader<Sha256>;
 /// Peer session type (write-only).
 pub type WireWriter<G> = CypherWriter<G, Sha256>;
 /// Reactor action.

@@ -572,8 +575,8 @@ where

         while let Some(ev) = self.service.next() {
             match ev {
                 Io::Write(node_id, msgs) => {
                     log::debug!(
                         target: "transport", "Sending {} message(s) to {}", msgs.len(), node_id
                     log::trace!(
                         target: "transport", "Writing {} message(s) to {}", msgs.len(), node_id
                     );
                     let fd = self.connected_fd_by_id(&node_id);
                     let mut data = Vec::new();