jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(bin): separate journald and file log filters, log debug to file by default (#5197)

Browse Source
This commit is contained in:
Alexey Shekhirin
2023-10-31 11:08:15 +00:00
committed by GitHub
parent 7907cece7c
commit 9ca44efe9f
27 changed files with 291 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/net/network/src/listener.rs
View File

@ -43,7 +43,7 @@ impl ConnectionListener {
match ready!(this.incoming.poll_next(cx)) {
Some(Ok((stream, remote_addr))) => {
if let Err(err) = stream.set_nodelay(true) {
tracing::warn!(target : "net", "set nodelay failed: {:?}", err);
tracing::warn!(target: "net", "set nodelay failed: {:?}", err);
}
Poll::Ready(ListenerEvent::Incoming { stream, remote_addr })
}

20
crates/net/network/src/manager.rs
View File

@ -360,7 +360,7 @@ where
_capabilities: Arc<Capabilities>,
_message: CapabilityMessage,
) {
trace!(target : "net", ?peer_id, "received unexpected message");
trace!(target: "net", ?peer_id, "received unexpected message");
self.swarm
.state_mut()
.peers_mut()
@ -506,7 +506,7 @@ where
unreachable!("Not emitted by session")
}
PeerMessage::Other(other) => {
debug!(target : "net", message_id=%other.id, "Ignoring unsupported message");
debug!(target: "net", message_id=%other.id, "Ignoring unsupported message");
}
}
}
@ -646,20 +646,20 @@ where
this.metrics.invalid_messages_received.increment(1);
}
SwarmEvent::TcpListenerClosed { remote_addr } => {
trace!(target : "net", ?remote_addr, "TCP listener closed.");
trace!(target: "net", ?remote_addr, "TCP listener closed.");
}
SwarmEvent::TcpListenerError(err) => {
trace!(target : "net", ?err, "TCP connection error.");
trace!(target: "net", ?err, "TCP connection error.");
}
SwarmEvent::IncomingTcpConnection { remote_addr, session_id } => {
trace!(target : "net", ?session_id, ?remote_addr, "Incoming connection");
trace!(target: "net", ?session_id, ?remote_addr, "Incoming connection");
this.metrics.total_incoming_connections.increment(1);
this.metrics
.incoming_connections
.set(this.swarm.state().peers().num_inbound_connections() as f64);
}
SwarmEvent::OutgoingTcpConnection { remote_addr, peer_id } => {
trace!(target : "net", ?remote_addr, ?peer_id, "Starting outbound connection.");
trace!(target: "net", ?remote_addr, ?peer_id, "Starting outbound connection.");
this.metrics.total_outgoing_connections.increment(1);
this.metrics
.outgoing_connections
@ -724,7 +724,7 @@ where
this.num_active_peers.fetch_sub(1, Ordering::Relaxed) - 1;
this.metrics.connected_peers.set(total_active as f64);
trace!(
target : "net",
target: "net",
?remote_addr,
?peer_id,
?total_active,
@ -769,7 +769,7 @@ where
}
SwarmEvent::IncomingPendingSessionClosed { remote_addr, error } => {
trace!(
target : "net",
target: "net",
?remote_addr,
?error,
"Incoming pending session failed"
@ -805,7 +805,7 @@ where
error,
} => {
trace!(
target : "net",
target: "net",
?remote_addr,
?peer_id,
?error,
@ -839,7 +839,7 @@ where
}
SwarmEvent::OutgoingConnectionError { remote_addr, peer_id, error } => {
trace!(
target : "net",
target: "net",
?remote_addr,
?peer_id,
?error,

10
crates/net/network/src/peers/manager.rs
View File

@ -540,7 +540,7 @@ impl PeersManager {
/// protocol
pub(crate) fn set_discovered_fork_id(&mut self, peer_id: PeerId, fork_id: ForkId) {
if let Some(peer) = self.peers.get_mut(&peer_id) {
trace!(target : "net::peers", ?peer_id, ?fork_id, "set discovered fork id");
trace!(target: "net::peers", ?peer_id, ?fork_id, "set discovered fork id");
peer.fork_id = Some(fork_id);
}
}
@ -589,7 +589,7 @@ impl PeersManager {
}
}
Entry::Vacant(entry) => {
trace!(target : "net::peers", ?peer_id, ?addr, "discovered new node");
trace!(target: "net::peers", ?peer_id, ?addr, "discovered new node");
let mut peer = Peer::with_kind(addr, kind);
peer.fork_id = fork_id;
entry.insert(peer);
@ -606,11 +606,11 @@ impl PeersManager {
}
let mut peer = entry.remove();
trace!(target : "net::peers", ?peer_id, "remove discovered node");
trace!(target: "net::peers", ?peer_id, "remove discovered node");
self.queued_actions.push_back(PeerAction::PeerRemoved(peer_id));
if peer.state.is_connected() {
trace!(target : "net::peers", ?peer_id, "disconnecting on remove from discovery");
trace!(target: "net::peers", ?peer_id, "disconnecting on remove from discovery");
// we terminate the active session here, but only remove the peer after the session
// was disconnected, this prevents the case where the session is scheduled for
// disconnect but the node is immediately rediscovered, See also
@ -697,7 +697,7 @@ impl PeersManager {
break
}
trace!(target : "net::peers", ?peer_id, addr=?peer.addr, "schedule outbound connection");
trace!(target: "net::peers", ?peer_id, addr=?peer.addr, "schedule outbound connection");
peer.state = PeerConnectionState::Out;
PeerAction::Connect { peer_id, remote_addr: peer.addr }

8
crates/net/network/src/session/active.rs
View File

@ -274,7 +274,7 @@ impl ActiveSession {
unreachable!("Not emitted by network")
}
PeerMessage::Other(other) => {
debug!(target : "net::session", message_id=%other.id, "Ignoring unsupported message");
debug!(target: "net::session", message_id=%other.id, "Ignoring unsupported message");
}
}
}
@ -294,7 +294,7 @@ impl ActiveSession {
self.queued_outgoing.push_back(msg.into());
}
Err(err) => {
debug!(target : "net", ?err, "Failed to respond to received request");
debug!(target: "net", ?err, "Failed to respond to received request");
}
}
}
@ -312,7 +312,7 @@ impl ActiveSession {
Ok(_) => Ok(()),
Err(err) => {
trace!(
target : "net",
target: "net",
%err,
"no capacity for incoming broadcast",
);
@ -338,7 +338,7 @@ impl ActiveSession {
Ok(_) => Ok(()),
Err(err) => {
trace!(
target : "net",
target: "net",
%err,
"no capacity for incoming request",
);

16
crates/net/network/src/session/mod.rs
View File

@ -202,7 +202,7 @@ impl SessionManager {
let session_id = self.next_id();
trace!(
target : "net::session",
target: "net::session",
?remote_addr,
?session_id,
"new pending incoming session"
@ -347,7 +347,7 @@ impl SessionManager {
return match event {
ActiveSessionMessage::Disconnected { peer_id, remote_addr } => {
trace!(
target : "net::session",
target: "net::session",
?peer_id,
"gracefully disconnected active session."
);
@ -359,7 +359,7 @@ impl SessionManager {
remote_addr,
error,
} => {
trace!(target : "net::session", ?peer_id, ?error,"closed session.");
trace!(target: "net::session", ?peer_id, ?error,"closed session.");
self.remove_active_session(&peer_id);
Poll::Ready(SessionEvent::SessionClosedOnConnectionError {
remote_addr,
@ -407,7 +407,7 @@ impl SessionManager {
// If there's already a session to the peer then we disconnect right away
if self.active_sessions.contains_key(&peer_id) {
trace!(
target : "net::session",
target: "net::session",
?session_id,
?remote_addr,
?peer_id,
@ -501,7 +501,7 @@ impl SessionManager {
}
PendingSessionEvent::Disconnected { remote_addr, session_id, direction, error } => {
trace!(
target : "net::session",
target: "net::session",
?session_id,
?remote_addr,
?error,
@ -531,7 +531,7 @@ impl SessionManager {
error,
} => {
trace!(
target : "net::session",
target: "net::session",
?error,
?session_id,
?remote_addr,
@ -544,7 +544,7 @@ impl SessionManager {
PendingSessionEvent::EciesAuthError { remote_addr, session_id, error, direction } => {
self.remove_pending_session(&session_id);
trace!(
target : "net::session",
target: "net::session",
?error,
?session_id,
?remote_addr,
@ -761,7 +761,7 @@ async fn start_pending_outbound_session(
let stream = match TcpStream::connect(remote_addr).await {
Ok(stream) => {
if let Err(err) = stream.set_nodelay(true) {
tracing::warn!(target : "net::session", "set nodelay failed: {:?}", err);
tracing::warn!(target: "net::session", "set nodelay failed: {:?}", err);
}
MeteredStream::new_with_meter(stream, bandwidth_meter)
}

2
crates/net/network/src/state.rs
View File

@ -420,7 +420,7 @@ where
// check if the error is due to a closed channel to the session
if res.err().map(|err| err.is_channel_closed()).unwrap_or_default() {
debug!(
target : "net",
target: "net",
?id,
"Request canceled, response channel from session closed."
);