liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

dont fail if client port fails to bind

Browse Source
This commit is contained in:
John Smith 2023-10-14 22:05:29 -04:00
parent e40975104e
commit a7fb7eea74
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
veilid-server/src/client_api.rs
View File

@ -2,7 +2,7 @@ use crate::settings::*;
use crate::tools::*; use crate::tools::*;
use crate::veilid_logs::VeilidLogs; use crate::veilid_logs::VeilidLogs;
use cfg_if::*; use cfg_if::*;
use futures_util::{future::try_join_all, stream::FuturesUnordered, StreamExt}; use futures_util::{future::join_all, stream::FuturesUnordered, StreamExt};
use parking_lot::Mutex; use parking_lot::Mutex;
use std::collections::HashMap; use std::collections::HashMap;
use std::net::SocketAddr; use std::net::SocketAddr;
@ -31,7 +31,7 @@ cfg_if! {
// --- Client API Server-Side --------------------------------- // --- Client API Server-Side ---------------------------------
type ClientApiAllFuturesJoinHandle = MustJoinHandle<std::io::Result<Vec<()>>>; type ClientApiAllFuturesJoinHandle = MustJoinHandle<Vec<()>>;
struct RequestLine { struct RequestLine {
// Request to process // Request to process
@ -104,9 +104,7 @@ impl ClientApi {
inner.join_handle.take().unwrap() inner.join_handle.take().unwrap()
}; };
trace!("ClientApi::stop: waiting for stop"); trace!("ClientApi::stop: waiting for stop");
if let Err(err) = jh.await { jh.await;
eprintln!("{}", err);
}
trace!("ClientApi::stop: stopped"); trace!("ClientApi::stop: stopped");
} }
@ -428,10 +426,15 @@ impl ClientApi {
#[instrument(level = "trace", skip(self))] #[instrument(level = "trace", skip(self))]
pub fn run(&self, bind_addrs: Vec<SocketAddr>) { pub fn run(&self, bind_addrs: Vec<SocketAddr>) {
let bind_futures = bind_addrs let bind_futures = bind_addrs.iter().copied().map(|addr| {
.iter() let this = self.clone();
.map(|addr| self.clone().handle_incoming(*addr)); async move {
let bind_futures_join = try_join_all(bind_futures); if let Err(e) = this.handle_incoming(addr).await {
warn!("Not binding client API to {}: {}", addr, e);
}
}
});
let bind_futures_join = join_all(bind_futures);
self.inner.lock().join_handle = Some(spawn(bind_futures_join)); self.inner.lock().join_handle = Some(spawn(bind_futures_join));
} }
} }