mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Fix a few logging-related things 

Signed-off-by: Alexis Sellier <self@cloudhead.io>
This commit is contained in:
Alexis Sellier 2023-01-17 11:01:03 +01:00
parent 97d4729fa4
commit 3bedb4438e
No known key found for this signature in database
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radicle-node/Cargo.toml
View File

@ -24,7 +24,7 @@ log = { version = "0.4.17", features = ["std"] }
nakamoto-net = { version = "0.3.0" } nakamoto-net = { version = "0.3.0" }
netservices = { version = "0", features = ["io-reactor", "socket2", "log"] } netservices = { version = "0", features = ["io-reactor", "socket2", "log"] }
nonempty = { version = "0.8.1", features = ["serialize"] } 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 } qcheck = { version = "1", default-features = false, optional = true }
sqlite = { version = "0.30.3" } sqlite = { version = "0.30.3" }
sqlite3-src = { version = "0.4.0", features = ["bundled"] } # Ensures static linking sqlite3-src = { version = "0.4.0", features = ["bundled"] } # Ensures static linking

11
radicle-node/src/service/reactor.rs
View File

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

7
radicle-node/src/wire/protocol.rs
View File

@ -31,8 +31,11 @@ use crate::worker::{WorkerReq, WorkerResp};
use crate::Link; use crate::Link;
use crate::{address, service}; use crate::{address, service};
/// Peer session type.
pub type WireSession<G> = CypherSession<G, Sha256>; pub type WireSession<G> = CypherSession<G, Sha256>;
/// Peer session type (read-only).
pub type WireReader = CypherReader<Sha256>; pub type WireReader = CypherReader<Sha256>;
/// Peer session type (write-only).
pub type WireWriter<G> = CypherWriter<G, Sha256>; pub type WireWriter<G> = CypherWriter<G, Sha256>;
/// Reactor action. /// Reactor action.
@ -572,8 +575,8 @@ where
while let Some(ev) = self.service.next() { while let Some(ev) = self.service.next() {
match ev { match ev {
Io::Write(node_id, msgs) => { Io::Write(node_id, msgs) => {
log::debug!( log::trace!(
target: "transport", "Sending {} message(s) to {}", msgs.len(), node_id target: "transport", "Writing {} message(s) to {}", msgs.len(), node_id
); );
let fd = self.connected_fd_by_id(&node_id); let fd = self.connected_fd_by_id(&node_id);
let mut data = Vec::new(); let mut data = Vec::new();