Skip to content

Commit e9bf7f7

Browse files
committed
remove commas from comma-separated kv pairs (#3737)
## Issue Addressed Logs are in comma separated kv list, but the values sometimes contain commas, which breaks parsing
1 parent d5a2de7 commit e9bf7f7

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

beacon_node/lighthouse_network/src/peer_manager/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
405405
debug!(self.log, "Identified Peer"; "peer" => %peer_id,
406406
"protocol_version" => &info.protocol_version,
407407
"agent_version" => &info.agent_version,
408-
"listening_ addresses" => ?info.listen_addrs,
408+
"listening_addresses" => ?info.listen_addrs,
409409
"observed_address" => ?info.observed_addr,
410410
"protocols" => ?info.protocols
411411
);

beacon_node/lighthouse_network/src/peer_manager/network_behaviour.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ impl<TSpec: EthSpec> NetworkBehaviour for PeerManager<TSpec> {
139139
// TODO: directly emit the ban event?
140140
BanResult::BadScore => {
141141
// This is a faulty state
142-
error!(self.log, "Connected to a banned peer, re-banning"; "peer_id" => %peer_id);
142+
error!(self.log, "Connected to a banned peer. Re-banning"; "peer_id" => %peer_id);
143143
// Reban the peer
144144
self.goodbye_peer(peer_id, GoodbyeReason::Banned, ReportSource::PeerManager);
145145
return;

beacon_node/lighthouse_network/src/rpc/handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ where
285285
} else {
286286
if !matches!(response, RPCCodedResponse::StreamTermination(..)) {
287287
// the stream is closed after sending the expected number of responses
288-
trace!(self.log, "Inbound stream has expired, response not sent";
288+
trace!(self.log, "Inbound stream has expired. Response not sent";
289289
"response" => %response, "id" => inbound_id);
290290
}
291291
return;

beacon_node/network/src/beacon_processor/worker/gossip_methods.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ impl<T: BeaconChainTypes> Worker<T> {
793793
| Err(e @ BlockError::BlockIsAlreadyKnown)
794794
| Err(e @ BlockError::RepeatProposal { .. })
795795
| Err(e @ BlockError::NotFinalizedDescendant { .. }) => {
796-
debug!(self.log, "Could not verify block for gossip, ignoring the block";
796+
debug!(self.log, "Could not verify block for gossip. Ignoring the block";
797797
"error" => %e);
798798
// Prevent recurring behaviour by penalizing the peer slightly.
799799
self.gossip_penalize_peer(
@@ -805,7 +805,7 @@ impl<T: BeaconChainTypes> Worker<T> {
805805
return None;
806806
}
807807
Err(ref e @ BlockError::ExecutionPayloadError(ref epe)) if !epe.penalize_peer() => {
808-
debug!(self.log, "Could not verify block for gossip, ignoring the block";
808+
debug!(self.log, "Could not verify block for gossip. Ignoring the block";
809809
"error" => %e);
810810
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Ignore);
811811
return None;
@@ -827,7 +827,7 @@ impl<T: BeaconChainTypes> Worker<T> {
827827
// TODO(merge): reconsider peer scoring for this event.
828828
| Err(e @ BlockError::ParentExecutionPayloadInvalid { .. })
829829
| Err(e @ BlockError::GenesisBlock) => {
830-
warn!(self.log, "Could not verify block for gossip, rejecting the block";
830+
warn!(self.log, "Could not verify block for gossip. Rejecting the block";
831831
"error" => %e);
832832
self.propagate_validation_result(message_id, peer_id, MessageAcceptance::Reject);
833833
self.gossip_penalize_peer(

beacon_node/network/src/beacon_processor/worker/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl<T: BeaconChainTypes> Worker<T> {
3838
/// Creates a log if there is an internal error.
3939
fn send_network_message(&self, message: NetworkMessage<T::EthSpec>) {
4040
self.network_tx.send(message).unwrap_or_else(|e| {
41-
debug!(self.log, "Could not send message to the network service, likely shutdown";
41+
debug!(self.log, "Could not send message to the network service. Likely shutdown";
4242
"error" => %e)
4343
});
4444
}

beacon_node/network/src/beacon_processor/worker/sync_methods.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ impl<T: BeaconChainTypes> Worker<T> {
428428
} else {
429429
// The block is in the future, but not too far.
430430
debug!(
431-
self.log, "Block is slightly ahead of our slot clock, ignoring.";
431+
self.log, "Block is slightly ahead of our slot clock. Ignoring.";
432432
"present_slot" => present_slot,
433433
"block_slot" => block_slot,
434434
"FUTURE_SLOT_TOLERANCE" => FUTURE_SLOT_TOLERANCE,

beacon_node/network/src/sync/manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ impl<T: BeaconChainTypes> SyncManager<T> {
633633

634634
// Some logs.
635635
if dropped_single_blocks_requests > 0 || dropped_parent_chain_requests > 0 {
636-
debug!(self.log, "Execution engine not online, dropping active requests.";
636+
debug!(self.log, "Execution engine not online. Dropping active requests.";
637637
"dropped_single_blocks_requests" => dropped_single_blocks_requests,
638638
"dropped_parent_chain_requests" => dropped_parent_chain_requests,
639639
);

beacon_node/network/src/sync/network_context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
242242
source: ReportSource::SyncService,
243243
})
244244
.unwrap_or_else(|_| {
245-
warn!(self.log, "Could not report peer, channel failed");
245+
warn!(self.log, "Could not report peer: channel failed");
246246
});
247247
}
248248

@@ -257,7 +257,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
257257
msg,
258258
})
259259
.unwrap_or_else(|e| {
260-
warn!(self.log, "Could not report peer, channel failed"; "error"=> %e);
260+
warn!(self.log, "Could not report peer: channel failed"; "error"=> %e);
261261
});
262262
}
263263

0 commit comments

Comments
 (0)