Fix external configuration handling (#332)

ntex-server/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [1.0.5] - 2024-04-02
+
+* Fix external configuration handling
+
 ## [1.0.4] - 2024-03-30
 
 * Fix signals support #324

ntex-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-server"
-version = "1.0.4"
+version = "1.0.5"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Server for ntex framework"
 keywords = ["network", "framework", "async", "futures"]

ntex-server/src/net/config.rs

@@ -193,7 +193,8 @@ impl FactoryService for ConfiguredService {
             let mut services = mem::take(&mut rt.0.borrow_mut().services);
 
             let mut res = Vec::new();
-            while let Some(Some(svc)) = services.pop() {
+            while let Some(svc) = services.pop() {
+                if let Some(svc) = svc {
                     for entry in names.values() {
                         if entry.idx == services.len() {
                             res.push(NetService {
@@ -205,6 +206,7 @@ impl FactoryService for ConfiguredService {
                         }
                     }
                 }
+            }
             Ok(res)
         })
     }

ntex-server/src/net/service.rs

@@ -107,6 +107,7 @@ impl ServiceFactory<ServerMessage> for StreamService {
         for info in &self.services {
             match info.factory.create(()).await {
                 Ok(svc) => {
+                    log::debug!("Constructed server service for {:?}", info.tokens);
                     services.push(svc);
                     let idx = services.len() - 1;
                     for (token, tag) in &info.tokens {
@@ -123,12 +124,10 @@ impl ServiceFactory<ServerMessage> for StreamService {
             }
         }
 
-        let conns = MAX_CONNS_COUNTER.with(|conns| conns.priv_clone());
-
         Ok(StreamServiceImpl {
             tokens,
             services,
-            conns,
+            conns: MAX_CONNS_COUNTER.with(|conns| conns.priv_clone()),
         })
     }
 }

ntex-server/src/wrk.rs

@@ -90,9 +90,9 @@ impl<T> Worker<T> {
             let _ = spawn(async move {
                 log::info!("Starting worker {:?}", id);
 
-                log::debug!("Creating server instance in {:?} worker", id);
+                log::debug!("Creating server instance in {:?}", id);
                 let factory = cfg.create().await;
-                log::debug!("Server instance has been created in {:?} worker", id);
+                log::debug!("Server instance has been created in {:?}", id);
 
                 match create(id, rx1, rx2, factory, avail_tx).await {
                     Ok((svc, wrk)) => {

ntex/Cargo.toml

@@ -64,7 +64,7 @@ ntex-service = "2.0.1"
 ntex-macros = "0.1.3"
 ntex-util = "1.0.1"
 ntex-bytes = "0.1.24"
-ntex-server = "1.0.3"
+ntex-server = "1.0.5"
 ntex-h2 = "0.5.2"
 ntex-rt = "0.4.12"
 ntex-io = "1.0.1"