Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Increase ping and reply timeout

Browse source 
While downloading logs for &music, the server would repeatedly time out
on ws pings because it took too much time responding to the log
commands. This change makes reconnects less likely at the cost of not
noticing them as quickly.
This commit is contained in:
Joscha 2022-07-05 20:49:32 +02:00
parent 9b3ea00d1b
commit 4effe38c1d
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/euph/conn.rs
View file

@ -27,6 +27,10 @@ use super::api::{
pub type WsStream = WebSocketStream<MaybeTlsStream<TcpStream>>; pub type WsStream = WebSocketStream<MaybeTlsStream<TcpStream>>;
/// Timeout used for any kind of reply from the server, including to ws and euph
/// pings. Also used as the time in-between pings.
const TIMEOUT: Duration = Duration::from_secs(30); // TODO Make configurable
#[derive(Debug, thiserror::Error)] #[derive(Debug, thiserror::Error)]
pub enum Error { pub enum Error {
#[error("connection closed")] #[error("connection closed")]
@ -182,7 +186,7 @@ impl State {
let mut state = Self { let mut state = Self {
ws_tx, ws_tx,
last_id: 0, last_id: 0,
replies: Replies::new(Duration::from_secs(10)), // TODO Make configurable replies: Replies::new(TIMEOUT),
packet_tx, packet_tx,
last_ws_ping: None, last_ws_ping: None,
last_ws_pong: None, last_ws_pong: None,
@ -213,7 +217,7 @@ impl State {
async fn send_ping_events(event_tx: &mpsc::UnboundedSender<Event>) -> anyhow::Result<()> { async fn send_ping_events(event_tx: &mpsc::UnboundedSender<Event>) -> anyhow::Result<()> {
loop { loop {
event_tx.send(Event::DoPings)?; event_tx.send(Event::DoPings)?;
time::sleep(Duration::from_secs(10)).await; // TODO Make configurable time::sleep(TIMEOUT).await;
} }
} }