hex/wstunnel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(restriction): Avoid re-creating a config reload notifier each time

Browse source
This commit is contained in:
Σrebe - Romain GERARD 2024-05-01 15:00:35 +02:00
parent 862d1dc9e2
commit 421a5a230c
No known key found for this signature in database
GPG key ID: 7A42B4B97E0332F4
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/restrictions/config_reloader.rs
View file

@ -94,7 +94,7 @@ impl RestrictionsRulesReloader {
&self.restrictions &self.restrictions
} }
pub fn wait_for_reload(&self) -> Notified { pub fn reload_notifier(&self) -> Notified {
match &self.state { match &self.state {
Static(st) => st.notified(), Static(st) => st.notified(),
Config(st) => st.should_reload_config.notified(), Config(st) => st.should_reload_config.notified(),

6
src/tunnel/server.rs
View file

@ -728,12 +728,16 @@ pub async fn run_server(server_config: Arc<WsServerConfig>, restrictions: Restri
// Bind server and run forever to serve incoming connections. // Bind server and run forever to serve incoming connections.
let mut restrictions = RestrictionsRulesReloader::new(restrictions, server_config.restriction_config.clone())?; let mut restrictions = RestrictionsRulesReloader::new(restrictions, server_config.restriction_config.clone())?;
let listener = TcpListener::bind(&server_config.bind).await?; let listener = TcpListener::bind(&server_config.bind).await?;
let mut await_config_reload = Box::pin(restrictions.reload_notifier());
loop { loop {
let cnx = select! { let cnx = select! {
biased; biased;
_ = restrictions.wait_for_reload() => { _ = &mut await_config_reload => {
drop(await_config_reload);
restrictions.reload_restrictions_config(); restrictions.reload_restrictions_config();
await_config_reload = Box::pin(restrictions.reload_notifier());
continue; continue;
}, },