studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add granular timeout configs for sync longpolling.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-07-27 10:36:19 +00:00
parent 7dd10ebc6c
commit e9d0baa32e
4 changed files with 60 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/client/sync/v3.rs
View File

@@ -1,5 +1,4 @@
use std::{
cmp::{self},
collections::{BTreeMap, HashMap, HashSet},
time::Duration,
};
@@ -150,9 +149,15 @@ pub(crate) async fn sync_events_route(
// Hang a few seconds so requests are not spammed
// Stop hanging if new info arrives
let default = Duration::from_secs(30);
let timeout = body.body.timeout.unwrap_or(default);
let duration = cmp::min(timeout, default);
let timeout_default = services.config.client_sync_timeout_default;
let timeout_min = services.config.client_sync_timeout_min;
let timeout_max = services.config.client_sync_timeout_max;
let duration = body
.body
.timeout
.unwrap_or_else(|| Duration::from_millis(timeout_default))
.clamp(Duration::from_millis(timeout_min), Duration::from_millis(timeout_max));
_ = tokio::time::timeout(duration, watcher).await;
// Retry returning data

12
src/api/client/sync/v5.rs
View File

@@ -1,5 +1,5 @@
use std::{
cmp::{self, Ordering},
cmp::Ordering,
collections::{BTreeMap, BTreeSet, HashMap, HashSet},
ops::Deref,
time::Duration,
@@ -204,8 +204,14 @@ pub(crate) async fn sync_events_v5_route(
{
// Hang a few seconds so requests are not spammed
// Stop hanging if new info arrives
let default = Duration::from_secs(30);
let duration = cmp::min(body.timeout.unwrap_or(default), default);
let timeout_default = services.config.client_sync_timeout_default;
let timeout_min = services.config.client_sync_timeout_min;
let timeout_max = services.config.client_sync_timeout_max;
let duration = body
.timeout
.unwrap_or_else(|| Duration::from_millis(timeout_default))
.clamp(Duration::from_millis(timeout_min), Duration::from_millis(timeout_max));
_ = tokio::time::timeout(duration, watcher).await;
}