pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-30 04:57:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix delay in message_lane_loop_is_able_to_recover_from_connection_errors (#850)

Browse Source
This commit is contained in:
Svyatoslav Nikolsky
2021-03-31 14:50:55 +03:00
committed by Bastian Köcher
parent bc50fa6616
commit b6d034afaf
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/relays/messages/src/message_lane_loop.rs
+1
View File
@@ -221,6 +221,7 @@ pub async fn run<P: MessageLane>(
) -> Result<(), String> {
let exit_signal = exit_signal.shared();
relay_utils::relay_loop(source_client, target_client)
.reconnect_delay(params.reconnect_delay)
.with_metrics(format!(
"{}_to_{}_MessageLane_{}",
P::SOURCE_NAME,
bridges/relays/utils/src/relay_loop.rs
+13 -3
View File
@@ -37,6 +37,7 @@ pub trait Client: Clone + Send + Sync {
/// Returns generic loop that may be customized and started.
pub fn relay_loop<SC, TC>(source_client: SC, target_client: TC) -> Loop<SC, TC, ()> {
Loop {
reconnect_delay: RECONNECT_DELAY,
source_client,
target_client,
loop_metric: None,
@@ -45,6 +46,7 @@ pub fn relay_loop<SC, TC>(source_client: SC, target_client: TC) -> Loop<SC, TC,
/// Generic relay loop.
pub struct Loop<SC, TC, LM> {
reconnect_delay: Duration,
source_client: SC,
target_client: TC,
loop_metric: Option<LM>,
@@ -58,6 +60,12 @@ pub struct LoopMetrics<SC, TC, LM> {
}
impl<SC, TC, LM> Loop<SC, TC, LM> {
/// Customize delay between reconnect attempts.
pub fn reconnect_delay(mut self, reconnect_delay: Duration) -> Self {
self.reconnect_delay = reconnect_delay;
self
}
/// Start building loop metrics using given prefix.
///
/// Panics if `prefix` is empty.
@@ -66,6 +74,7 @@ impl<SC, TC, LM> Loop<SC, TC, LM> {
LoopMetrics {
relay_loop: Loop {
reconnect_delay: self.reconnect_delay,
source_client: self.source_client,
target_client: self.target_client,
loop_metric: None,
@@ -100,7 +109,7 @@ impl<SC, TC, LM> Loop<SC, TC, LM> {
match result {
Ok(()) => break,
Err(failed_client) => loop {
async_std::task::sleep(RECONNECT_DELAY).await;
async_std::task::sleep(self.reconnect_delay).await;
if failed_client == FailedClient::Both || failed_client == FailedClient::Source {
match self.source_client.reconnect().await {
Ok(()) => (),
@@ -108,7 +117,7 @@ impl<SC, TC, LM> Loop<SC, TC, LM> {
log::warn!(
target: "bridge",
"Failed to reconnect to source client. Going to retry in {}s: {:?}",
RECONNECT_DELAY.as_secs(),
self.reconnect_delay.as_secs(),
error,
);
continue;
@@ -122,7 +131,7 @@ impl<SC, TC, LM> Loop<SC, TC, LM> {
log::warn!(
target: "bridge",
"Failed to reconnect to target client. Going to retry in {}s: {:?}",
RECONNECT_DELAY.as_secs(),
self.reconnect_delay.as_secs(),
error,
);
continue;
@@ -189,6 +198,7 @@ impl<SC, TC, LM> LoopMetrics<SC, TC, LM> {
}
Ok(Loop {
reconnect_delay: self.relay_loop.reconnect_delay,
source_client: self.relay_loop.source_client,
target_client: self.relay_loop.target_client,
loop_metric: self.loop_metric,