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

fix: change tokio::sync::Notify to tokio_util::sync::CancellationToken

Browse source
This commit is contained in:
Jun Kurihara 2024-07-26 20:58:00 +09:00
commit 0950fdbd15
No known key found for this signature in database
GPG key ID: D992B3E3DE1DED23
8 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rpxy-bin/Cargo.toml
View file

@ -39,6 +39,7 @@ tokio = { version = "1.39.1", default-features = false, features = [
"sync",
"macros",
] }
tokio-util = { version = "0.7.11", default-features = false }
async-trait = "0.1.81"
futures-util = { version = "0.3.30", default-features = false }

13
rpxy-bin/src/main.rs
View file

@ -127,11 +127,11 @@ async fn rpxy_service_with_watcher(
.await
.map_err(|e| anyhow!("Invalid cert configuration: {e}"))?;
// Notifier for proxy service termination
let term_notify = std::sync::Arc::new(tokio::sync::Notify::new());
// Continuous monitoring
loop {
// Notifier for proxy service termination
let cancel_token = tokio_util::sync::CancellationToken::new();
let (cert_service, cert_rx) = cert_service_and_rx
.as_ref()
.map(|(s, r)| (Some(s), Some(r)))
@ -140,7 +140,7 @@ async fn rpxy_service_with_watcher(
#[cfg(feature = "acme")]
let (acme_join_handles, server_config_acme_challenge) = acme_manager
.as_ref()
.map(|m| m.spawn_manager_tasks(Some(term_notify.clone())))
.map(|m| m.spawn_manager_tasks(Some(cancel_token.child_token())))
.unwrap_or((vec![], Default::default()));
let rpxy_opts = {
@ -150,7 +150,7 @@ async fn rpxy_service_with_watcher(
.app_config_list(app_conf.clone())
.cert_rx(cert_rx.cloned())
.runtime_handle(runtime_handle.clone())
.term_notify(Some(term_notify.clone()))
.cancel_token(Some(cancel_token.child_token()))
.server_configs_acme_challenge(std::sync::Arc::new(server_config_acme_challenge))
.build();
@ -216,8 +216,7 @@ async fn rpxy_service_with_watcher(
}
info!("Configuration updated. Terminate all spawned services and force to re-bind TCP/UDP sockets");
term_notify.notify_waiters();
// tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
cancel_token.cancel();
}
else => break
}