Mirrors/asciinema
1
0
Fork 0
mirror of https://github.com/asciinema/asciinema.git synced 2025-12-16 03:38:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add jitter to exponential backoff in forwarder reconnection

Browse Source
This commit is contained in:
Marcin Kulik
2025-06-01 22:47:36 +02:00
parent ed88e7fc36
commit 624379680a
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@@ -95,6 +95,7 @@ dependencies = [
"config", "config",
"futures-util", "futures-util",
"nix 0.30.1", "nix 0.30.1",
"rand",
"reqwest", "reqwest",
"rgb", "rgb",
"rust-embed", "rust-embed",

1
Cargo.toml
View File

@@ -41,6 +41,7 @@ url = "2.5.0"
tokio-tungstenite = { version = "0.26.2", default-features = false, features = ["connect", "rustls-tls-native-roots"] } tokio-tungstenite = { version = "0.26.2", default-features = false, features = ["connect", "rustls-tls-native-roots"] }
rustls = { version = "0.23.26", default-features = false, features = ["aws_lc_rs"] } rustls = { version = "0.23.26", default-features = false, features = ["aws_lc_rs"] }
tokio-util = "0.7.10" tokio-util = "0.7.10"
rand = "0.9.1"
[build-dependencies] [build-dependencies]
clap = { version = "4.5.37", features = ["derive"] } clap = { version = "4.5.37", features = ["derive"] }

9
src/forwarder.rs
View File

@@ -5,6 +5,7 @@ use std::time::Duration;
use anyhow::{anyhow, bail}; use anyhow::{anyhow, bail};
use axum::http::Uri; use axum::http::Uri;
use futures_util::{SinkExt, Stream, StreamExt}; use futures_util::{SinkExt, Stream, StreamExt};
use rand::Rng;
use tokio::net::TcpStream; use tokio::net::TcpStream;
use tokio::time::{interval, sleep, timeout}; use tokio::time::{interval, sleep, timeout};
use tokio_stream::wrappers::errors::BroadcastStreamRecvError; use tokio_stream::wrappers::errors::BroadcastStreamRecvError;
@@ -23,7 +24,8 @@ use crate::stream::Subscriber;
const PING_INTERVAL: u64 = 15; const PING_INTERVAL: u64 = 15;
const PING_TIMEOUT: u64 = 10; const PING_TIMEOUT: u64 = 10;
const SEND_TIMEOUT: u64 = 10; const SEND_TIMEOUT: u64 = 10;
const MAX_RECONNECT_DELAY: u64 = 5000; const RECONNECT_DELAY_BASE: u64 = 500;
const RECONNECT_DELAY_CAP: u64 = 10_000;
pub async fn forward<N: Notifier>( pub async fn forward<N: Notifier>(
url: url::Url, url: url::Url,
@@ -224,7 +226,10 @@ fn handle_close_frame(frame: Option<CloseFrame>) -> anyhow::Result<()> {
} }
fn exponential_delay(attempt: usize) -> u64 { fn exponential_delay(attempt: usize) -> u64 {
(2_u64.pow(attempt as u32) * 500).min(MAX_RECONNECT_DELAY) let mut rng = rand::rng();
let base = (RECONNECT_DELAY_BASE * 2_u64.pow(attempt as u32)).min(RECONNECT_DELAY_CAP);
rng.random_range(..base)
} }
fn ws_result(m: Result<Vec<u8>, BroadcastStreamRecvError>) -> anyhow::Result<Message> { fn ws_result(m: Result<Vec<u8>, BroadcastStreamRecvError>) -> anyhow::Result<Message> {