tuxmain/rust-rpxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip: fixing dynamic reloading

Browse source
This commit is contained in:
Jun Kurihara 2024-07-26 23:25:40 +09:00
commit 8d9f07a848
No known key found for this signature in database
GPG key ID: D992B3E3DE1DED23
3 changed files with 44 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

37
rpxy-lib/src/lib.rs
View file

@ -19,7 +19,7 @@ use crate::{
message_handler::HttpMessageHandlerBuilder,
proxy::Proxy,
};
use futures::future::select_all;
use futures::future::join_all;
use hot_reload::ReloaderReceiver;
use rpxy_certs::ServerCryptoBase;
use std::sync::Arc;
@ -130,8 +130,9 @@ pub async fn entrypoint(
let connection_builder = proxy::connection_builder(&globals);
// spawn each proxy for a given socket with copied Arc-ed backend, message_handler and connection builder.
let parent_cancel_token = globals.cancel_token.clone().unwrap_or_default();
let addresses = globals.proxy_config.listen_sockets.clone();
let futures_iter = addresses.into_iter().map(|listening_on| {
let join_handles = addresses.into_iter().map(|listening_on| {
let mut tls_enabled = false;
if let Some(https_port) = globals.proxy_config.https_port {
tls_enabled = https_port == listening_on.port()
@ -143,11 +144,37 @@ pub async fn entrypoint(
connection_builder: connection_builder.clone(),
message_handler: message_handler.clone(),
};
globals.runtime_handle.spawn(async move { proxy.start().await })
let cancel_token = parent_cancel_token.child_token();
let parent_cancel_token_clone = parent_cancel_token.clone();
globals.runtime_handle.spawn(async move {
info!("rpxy proxy service for {listening_on} started");
tokio::select! {
_ = cancel_token.cancelled() => {
info!("rpxy proxy service for {listening_on} terminated");
Ok(())
},
proxy_res = proxy.start() => {
info!("rpxy proxy service for {listening_on} exited");
// cancel other proxy tasks
parent_cancel_token_clone.cancel();
proxy_res
}
}
})
});
if let (Ok(Err(e)), _, _) = select_all(futures_iter).await {
error!("Some proxy services are down: {}", e);
let join_res = join_all(join_handles).await;
let mut errs = join_res.into_iter().filter_map(|res| {
if let Ok(Err(e)) = res {
error!("Some proxy services are down: {}", e);
Some(e)
} else {
None
}
});
// returns the first error as the representative error
if let Some(e) = errs.next() {
return Err(e);
}