Skip to content
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 16 additions & 6 deletions livekit-api/src/signal_client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -238,15 +238,25 @@ impl SignalClient {
// if every region fails the caller sees why the last region
// connection failed.
let mut last_err = err;
for url in urls.iter() {
log::info!("fallback connection to: {}", url);
match SignalInner::connect(url, token, options.clone(), publisher_offer.clone())
.await
for region_url in urls.iter() {
log::info!("fallback connection to: {}", region_url);
match SignalInner::connect(
region_url,
token,
options.clone(),
publisher_offer.clone(),
)
.await
{
Ok((inner, join_response, stream_events)) => {
return Ok(handle_success(inner, join_response, stream_events))
}
Err(region_conn_err) => last_err = region_conn_err,
Err(region_conn_err) => {
// This region is unreachable; drop it from the cache
// so the next attempt doesn't hand it out again.
RegionUrlProvider::mark_failed(url, region_url);
last_err = region_conn_err;
}
}
}

Expand Down Expand Up @@ -1299,7 +1309,7 @@ mod tests {
let endpoint = format!("http://127.0.0.1:{}/settings/regions", addr.port());
let result = region::fetch_from_endpoint(&endpoint, "fake-token").await;

let urls = result.unwrap();
let (urls, _max_age) = result.unwrap();
assert_eq!(
urls,
vec![
Expand Down
Loading