diff --git a/beacon_node/eth1/src/service.rs b/beacon_node/eth1/src/service.rs index faef1cf3e..5d33af6b6 100644 --- a/beacon_node/eth1/src/service.rs +++ b/beacon_node/eth1/src/service.rs @@ -139,8 +139,9 @@ async fn endpoint_state( let error_connecting = |_| { warn!( log, - "Error connecting to eth1 node. Trying fallback ..."; + "Error connecting to eth1 node endpoint"; "endpoint" => endpoint, + "action" => "trying fallbacks" ); EndpointError::NotReachable }; @@ -150,9 +151,9 @@ async fn endpoint_state( if &network_id != config_network_id { warn!( log, - "Invalid eth1 network id. Please switch to correct network id. Trying \ - fallback ..."; + "Invalid eth1 network id on endpoint. Please switch to correct network id"; "endpoint" => endpoint, + "action" => "trying fallbacks", "expected" => format!("{:?}",config_network_id), "received" => format!("{:?}",network_id), ); @@ -168,15 +169,16 @@ async fn endpoint_state( log, "Remote eth1 node is not synced"; "endpoint" => endpoint, + "action" => "trying fallbacks" ); return Err(EndpointError::FarBehind); } if &chain_id != config_chain_id { warn!( log, - "Invalid eth1 chain id. Please switch to correct chain id. Trying \ - fallback ..."; + "Invalid eth1 chain id. Please switch to correct chain id on endpoint"; "endpoint" => endpoint, + "action" => "trying fallbacks", "expected" => format!("{:?}",config_chain_id), "received" => format!("{:?}", chain_id), ); @@ -215,16 +217,22 @@ async fn get_remote_head_and_new_block_ranges( if remote_head_block.timestamp + node_far_behind_seconds < now { warn!( service.log, - "Eth1 endpoint is far behind. Trying fallback ..."; + "Eth1 endpoint is not synced"; "endpoint" => endpoint, - "last_seen_block_unix_timestamp" => remote_head_block.timestamp + "last_seen_block_unix_timestamp" => remote_head_block.timestamp, + "action" => "trying fallback" ); return Err(SingleEndpointError::EndpointError(EndpointError::FarBehind)); } let handle_remote_not_synced = |e| { if let SingleEndpointError::RemoteNotSynced { .. } = e { - warn!(service.log, "Eth1 node not synced. Trying fallback..."; "endpoint" => endpoint); + warn!( + service.log, + "Eth1 endpoint is not synced"; + "endpoint" => endpoint, + "action" => "trying fallbacks" + ); } e };