more logs
This commit is contained in:
parent
e8d992168c
commit
d11d6c1f8a
|
@ -17,7 +17,7 @@ use std::time::Duration;
|
||||||
use std::{fmt::Display, sync::Arc};
|
use std::{fmt::Display, sync::Arc};
|
||||||
use tokio::sync::broadcast;
|
use tokio::sync::broadcast;
|
||||||
use tokio::time::timeout;
|
use tokio::time::timeout;
|
||||||
use tracing::{debug, error};
|
use tracing::{debug, error, warn};
|
||||||
|
|
||||||
// TODO: type for Hydrated Blocks with their full transactions?
|
// TODO: type for Hydrated Blocks with their full transactions?
|
||||||
pub type ArcBlock = Arc<Block<TxHash>>;
|
pub type ArcBlock = Arc<Block<TxHash>>;
|
||||||
|
@ -439,10 +439,11 @@ impl Web3Rpcs {
|
||||||
match timeout(double_block_time, block_receiver.recv_async()).await {
|
match timeout(double_block_time, block_receiver.recv_async()).await {
|
||||||
Ok(Ok((new_block, rpc))) => {
|
Ok(Ok((new_block, rpc))) => {
|
||||||
let rpc_name = rpc.name.clone();
|
let rpc_name = rpc.name.clone();
|
||||||
|
let rpc_is_backup = rpc.backup;
|
||||||
|
|
||||||
// TODO: what timeout on this?
|
// TODO: what timeout on this?
|
||||||
match timeout(
|
match timeout(
|
||||||
Duration::from_secs(2),
|
Duration::from_secs(1),
|
||||||
consensus_finder.process_block_from_rpc(
|
consensus_finder.process_block_from_rpc(
|
||||||
self,
|
self,
|
||||||
authorization,
|
authorization,
|
||||||
|
@ -468,10 +469,14 @@ impl Web3Rpcs {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(timeout) => {
|
Err(timeout) => {
|
||||||
error!(
|
if rpc_is_backup {
|
||||||
"timeout while processing block from {}: {:#?}",
|
debug!(
|
||||||
rpc_name, timeout
|
?timeout,
|
||||||
);
|
"timeout while processing block from {}", rpc_name
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
warn!(?timeout, "timeout while processing block from {}", rpc_name);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -872,9 +872,9 @@ impl ConsensusFinder {
|
||||||
backup_entry.1 += rpc.soft_limit;
|
backup_entry.1 += rpc.soft_limit;
|
||||||
|
|
||||||
let parent_hash = block_to_check.parent_hash();
|
let parent_hash = block_to_check.parent_hash();
|
||||||
// TODO: i flip flop on passing rpc to this or not
|
|
||||||
match web3_rpcs
|
match web3_rpcs
|
||||||
.block(authorization, parent_hash, Some(rpc), None, None)
|
.block(authorization, parent_hash, Some(rpc), Some(1), None)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(parent_block) => block_to_check = parent_block,
|
Ok(parent_block) => block_to_check = parent_block,
|
||||||
|
|
|
@ -1038,9 +1038,9 @@ impl Web3Rpc {
|
||||||
if !self.backup {
|
if !self.backup {
|
||||||
let when = retry_at.duration_since(Instant::now());
|
let when = retry_at.duration_since(Instant::now());
|
||||||
warn!(
|
warn!(
|
||||||
"Exhausted rate limit on {}. Retry in {}ms",
|
retry_ms=%when.as_millis(),
|
||||||
|
"Exhausted rate limit on {}",
|
||||||
self,
|
self,
|
||||||
when.as_millis()
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue