cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

remove commas from comma-separated kv pairs (#3737)

Browse Source 
## Issue Addressed

Logs are in comma separated kv list, but the values sometimes contain commas, which breaks parsing
This commit is contained in:
antondlr 2022-11-25 07:57:10 +00:00
parent d5a2de759b
commit e9bf7f7cc1
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/lighthouse_network/src/peer_manager/mod.rs
View File

@ -405,7 +405,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
debug!(self.log, "Identified Peer"; "peer" => %peer_id, debug!(self.log, "Identified Peer"; "peer" => %peer_id,
"protocol_version" => &info.protocol_version, "protocol_version" => &info.protocol_version,
"agent_version" => &info.agent_version, "agent_version" => &info.agent_version,
"listening_ addresses" => ?info.listen_addrs, "listening_addresses" => ?info.listen_addrs,
"observed_address" => ?info.observed_addr, "observed_address" => ?info.observed_addr,
"protocols" => ?info.protocols "protocols" => ?info.protocols
); );

2
beacon_node/lighthouse_network/src/peer_manager/network_behaviour.rs
View File

@ -139,7 +139,7 @@ impl<TSpec: EthSpec> NetworkBehaviour for PeerManager<TSpec> {
// TODO: directly emit the ban event? // TODO: directly emit the ban event?
BanResult::BadScore => { BanResult::BadScore => {
// This is a faulty state // This is a faulty state
error!(self.log, "Connected to a banned peer, re-banning"; "peer_id" => %peer_id); error!(self.log, "Connected to a banned peer. Re-banning"; "peer_id" => %peer_id);
// Reban the peer // Reban the peer
self.goodbye_peer(peer_id, GoodbyeReason::Banned, ReportSource::PeerManager); self.goodbye_peer(peer_id, GoodbyeReason::Banned, ReportSource::PeerManager);
return; return;

2
beacon_node/lighthouse_network/src/rpc/handler.rs
View File

@ -285,7 +285,7 @@ where
} else { } else {
if !matches!(response, RPCCodedResponse::StreamTermination(..)) { if !matches!(response, RPCCodedResponse::StreamTermination(..)) {
// the stream is closed after sending the expected number of responses // the stream is closed after sending the expected number of responses
trace!(self.log, "Inbound stream has expired, response not sent"; trace!(self.log, "Inbound stream has expired. Response not sent";
"response" => %response, "id" => inbound_id); "response" => %response, "id" => inbound_id);
} }
return; return;

6
beacon_node/network/src/beacon_processor/worker/gossip_methods.rs
View File

@ -793,7 +793,7 @@ impl<T: BeaconChainTypes> Worker<T> {
| Err(e @ BlockError::BlockIsAlreadyKnown) | Err(e @ BlockError::BlockIsAlreadyKnown)
| Err(e @ BlockError::RepeatProposal { .. }) | Err(e @ BlockError::RepeatProposal { .. })
| Err(e @ BlockError::NotFinalizedDescendant { .. }) => { | Err(e @ BlockError::NotFinalizedDescendant { .. }) => {
debug!(self.log, "Could not verify block for gossip, ignoring the block"; debug!(self.log, "Could not verify block for gossip. Ignoring the block";
"error" => %e); "error" => %e);
// Prevent recurring behaviour by penalizing the peer slightly. // Prevent recurring behaviour by penalizing the peer slightly.
self.gossip_penalize_peer( self.gossip_penalize_peer(
@ -805,7 +805,7 @@ impl<T: BeaconChainTypes> Worker<T> {
return None; return None;
} }
Err(ref e @ BlockError::ExecutionPayloadError(ref epe)) if !epe.penalize_peer() => { Err(ref e @ BlockError::ExecutionPayloadError(ref epe)) if !epe.penalize_peer() => {
debug!(self.log, "Could not verify block for gossip, ignoring the block"; debug!(self.log, "Could not verify block for gossip. Ignoring the block";
"error" => %e); "error" => %e);
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore); self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
return None; return None;
@ -827,7 +827,7 @@ impl<T: BeaconChainTypes> Worker<T> {
// TODO(merge): reconsider peer scoring for this event. // TODO(merge): reconsider peer scoring for this event.
| Err(e @ BlockError::ParentExecutionPayloadInvalid { .. }) | Err(e @ BlockError::ParentExecutionPayloadInvalid { .. })
| Err(e @ BlockError::GenesisBlock) => { | Err(e @ BlockError::GenesisBlock) => {
warn!(self.log, "Could not verify block for gossip, rejecting the block"; warn!(self.log, "Could not verify block for gossip. Rejecting the block";
"error" => %e); "error" => %e);
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Reject); self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Reject);
self.gossip_penalize_peer( self.gossip_penalize_peer(

2
beacon_node/network/src/beacon_processor/worker/mod.rs
View File

@ -38,7 +38,7 @@ impl<T: BeaconChainTypes> Worker<T> {
/// Creates a log if there is an internal error. /// Creates a log if there is an internal error.
fn send_network_message(&self, message: NetworkMessage<T::EthSpec>) { fn send_network_message(&self, message: NetworkMessage<T::EthSpec>) {
self.network_tx.send(message).unwrap_or_else(|e| { self.network_tx.send(message).unwrap_or_else(|e| {
debug!(self.log, "Could not send message to the network service, likely shutdown"; debug!(self.log, "Could not send message to the network service. Likely shutdown";
"error" => %e) "error" => %e)
}); });
} }

2
beacon_node/network/src/beacon_processor/worker/sync_methods.rs
View File

@ -428,7 +428,7 @@ impl<T: BeaconChainTypes> Worker<T> {
} else { } else {
// The block is in the future, but not too far. // The block is in the future, but not too far.
debug!( debug!(
self.log, "Block is slightly ahead of our slot clock, ignoring."; self.log, "Block is slightly ahead of our slot clock. Ignoring.";
"present_slot" => present_slot, "present_slot" => present_slot,
"block_slot" => block_slot, "block_slot" => block_slot,
"FUTURE_SLOT_TOLERANCE" => FUTURE_SLOT_TOLERANCE, "FUTURE_SLOT_TOLERANCE" => FUTURE_SLOT_TOLERANCE,

2
beacon_node/network/src/sync/manager.rs
View File

@ -633,7 +633,7 @@ impl<T: BeaconChainTypes> SyncManager<T> {
// Some logs. // Some logs.
if dropped_single_blocks_requests > 0 || dropped_parent_chain_requests > 0 { if dropped_single_blocks_requests > 0 || dropped_parent_chain_requests > 0 {
debug!(self.log, "Execution engine not online, dropping active requests."; debug!(self.log, "Execution engine not online. Dropping active requests.";
"dropped_single_blocks_requests" => dropped_single_blocks_requests, "dropped_single_blocks_requests" => dropped_single_blocks_requests,
"dropped_parent_chain_requests" => dropped_parent_chain_requests, "dropped_parent_chain_requests" => dropped_parent_chain_requests,
); );

4
beacon_node/network/src/sync/network_context.rs
View File

@ -242,7 +242,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
source: ReportSource::SyncService, source: ReportSource::SyncService,
}) })
.unwrap_or_else(|_| { .unwrap_or_else(|_| {
warn!(self.log, "Could not report peer, channel failed"); warn!(self.log, "Could not report peer: channel failed");
}); });
} }
@ -257,7 +257,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
msg, msg,
}) })
.unwrap_or_else(|e| { .unwrap_or_else(|e| {
warn!(self.log, "Could not report peer, channel failed"; "error"=> %e); warn!(self.log, "Could not report peer: channel failed"; "error"=> %e);
}); });
} }