Skip to content

Commit 1e6f5d2

Browse files
committed
refactor(relay): move huge context data away from logs main msg
And instead add them to a property. This allow to keep the main log messages leans while still providing detailed errors info.
1 parent 56173c2 commit 1e6f5d2

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

mithril-relay/src/relay/aggregator.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ impl AggregatorRelay {
5353
},
5454
Err(err) => {
5555
error!(
56-
self.logger,
57-
"Relay aggregator: Post `/register-signatures` failed: {err:?}"
56+
self.logger, "Relay aggregator: Post `/register-signatures` failed";
57+
"error" => ?err
5858
);
59-
Err(anyhow!("Post `/register-signatures` failed: {err:?}"))
59+
Err(anyhow!(err).context("Post `/register-signatures` failed"))
6060
}
6161
}
6262
}
@@ -84,10 +84,10 @@ impl AggregatorRelay {
8484
},
8585
Err(err) => {
8686
error!(
87-
self.logger,
88-
"Relay aggregator: Post `/register-signer` failed: {err:?}"
87+
self.logger, "Relay aggregator: Post `/register-signer` failed";
88+
"error" => ?err
8989
);
90-
Err(anyhow!("Post `/register-signer` failed: {err:?}"))
90+
Err(anyhow!(err).context("Post `/register-signer` failed"))
9191
}
9292
}
9393
}

mithril-relay/src/relay/signer.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,26 +306,23 @@ mod handlers {
306306
Ok(Box::new(warp::reply::with_status(content, status)))
307307
}
308308
Err(err) => {
309-
debug!(logger, "SignerRelay: received error '{err:?}'");
309+
debug!(logger, "SignerRelay: received error"; "error" => ?err);
310310
Ok(Box::new(warp::reply::with_status(
311311
format!("{err:?}"),
312312
StatusCode::INTERNAL_SERVER_ERROR,
313313
)))
314314
}
315315
},
316316
Err(err) => {
317-
debug!(
318-
logger,
319-
"SignerRelay: failed to parse the returned status '{err:?}'"
320-
);
317+
debug!(logger, "SignerRelay: failed to parse the returned status"; "error" => ?err);
321318
Ok(Box::new(warp::reply::with_status(
322319
format!("{err:?}"),
323320
StatusCode::INTERNAL_SERVER_ERROR,
324321
)))
325322
}
326323
},
327324
Err(err) => {
328-
debug!(logger, "SignerRelay: received error '{err:?}'");
325+
debug!(logger, "SignerRelay: received error"; "error" => ?err);
329326
Ok(Box::new(warp::reply::with_status(
330327
format!("{err:?}"),
331328
StatusCode::INTERNAL_SERVER_ERROR,

mithril-relay/tests/register_signer_signature.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,15 @@ async fn should_receive_registrations_from_signers_when_subscribed_to_pubsub() {
140140
event = p2p_client1.tick_peer() => {
141141
if let Ok(Some(BroadcastMessage::RegisterSigner(signer_message_received))) = p2p_client1.convert_peer_event_to_message(event.unwrap().unwrap())
142142
{
143-
info!("Test: client1 consumed signer registration: {signer_message_received:#?}");
143+
info!("Test: client1 consumed signer registration"; "message" => #?signer_message_received);
144144
assert_eq!(signer_message_sent, signer_message_received);
145145
total_peers_has_received_message += 1
146146
}
147147
}
148148
event = p2p_client2.tick_peer() => {
149149
if let Ok(Some(BroadcastMessage::RegisterSigner(signer_message_received))) = p2p_client2.convert_peer_event_to_message(event.unwrap().unwrap())
150150
{
151-
info!("Test: client2 consumed signer registration: {signer_message_received:#?}");
151+
info!("Test: client2 consumed signer registration"; "message" => #?signer_message_received);
152152
assert_eq!(signer_message_sent, signer_message_received);
153153
total_peers_has_received_message += 1
154154
}
@@ -185,15 +185,15 @@ async fn should_receive_registrations_from_signers_when_subscribed_to_pubsub() {
185185
event = p2p_client1.tick_peer() => {
186186
if let Ok(Some(BroadcastMessage::RegisterSignature(signature_message_received))) = p2p_client1.convert_peer_event_to_message(event.unwrap().unwrap())
187187
{
188-
info!("Test: client1 consumed signature: {signature_message_received:#?}");
188+
info!("Test: client1 consumed signature"; "message" => #?signature_message_received);
189189
assert_eq!(signature_message_sent, signature_message_received);
190190
total_peers_has_received_message += 1
191191
}
192192
}
193193
event = p2p_client2.tick_peer() => {
194194
if let Ok(Some(BroadcastMessage::RegisterSignature(signature_message_received))) = p2p_client2.convert_peer_event_to_message(event.unwrap().unwrap())
195195
{
196-
info!("Test: client2 consumed signature: {signature_message_received:#?}");
196+
info!("Test: client2 consumed signature"; "message" => #?signature_message_received);
197197
assert_eq!(signature_message_sent, signature_message_received);
198198
total_peers_has_received_message += 1
199199
}

0 commit comments

Comments
 (0)