Skip to content

fix: ping/pong upstream server #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions crates/websocket-proxy/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ use server::Server;
use std::io::Write;
use std::net::SocketAddr;
use std::sync::Arc;
use subscriber::WebsocketSubscriber;
use std::time::Duration;
use subscriber::{SubscriberOptions, WebsocketSubscriber};
use tokio::signal::unix::{signal, SignalKind};
use tokio::sync::broadcast;
use tokio_util::sync::CancellationToken;
Expand Down Expand Up @@ -110,8 +111,16 @@ struct Args {
metrics_host_label: bool,

/// Maximum backoff allowed for upstream connections
#[arg(long, env, default_value = "20")]
subscriber_max_interval: u64,
#[arg(long, env, default_value = "20000")]
subscriber_max_interval_ms: u64,

/// Interval in milliseconds between ping messages sent to upstream servers to detect unresponsive connections
#[arg(long, env, default_value = "2000")]
subscriber_ping_interval_ms: u64,

/// Timeout in milliseconds to wait for pong responses from upstream servers before considering the connection dead
#[arg(long, env, default_value = "4000")]
subscriber_pong_timeout_ms: u64,

#[arg(
long,
Expand Down Expand Up @@ -242,12 +251,15 @@ async fn main() {
let token_clone = token.clone();
let metrics_clone = metrics.clone();

let mut subscriber = WebsocketSubscriber::new(
uri_clone.clone(),
listener_clone,
args.subscriber_max_interval,
metrics_clone,
);
let options = SubscriberOptions::default()
.with_max_backoff_interval(Duration::from_millis(args.subscriber_max_interval_ms))
.with_ping_interval(Duration::from_millis(args.subscriber_ping_interval_ms))
.with_pong_timeout(Duration::from_millis(args.subscriber_pong_timeout_ms))
.with_backoff_initial_interval(Duration::from_millis(500))
.with_initial_grace_period(Duration::from_secs(5));

let mut subscriber =
WebsocketSubscriber::new(uri_clone.clone(), listener_clone, metrics_clone, options);

let task = tokio::spawn(async move {
info!(
Expand Down
Loading
Loading