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

erebe · May 1, 2024 · 421a5a2 · 421a5a2
1 parent 862d1dc
commit 421a5a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/restrictions/config_reloader.rs b/src/restrictions/config_reloader.rs
@@ -94,7 +94,7 @@ impl RestrictionsRulesReloader {
         &self.restrictions
     }
 
-    pub fn wait_for_reload(&self) -> Notified {
+    pub fn reload_notifier(&self) -> Notified {
         match &self.state {
             Static(st) => st.notified(),
             Config(st) => st.should_reload_config.notified(),

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