Added Service::poll() method (#481)

ntex-server/CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [2.6.0] - 2024-12-04
+
+* Use updated Service trait
+
 ## [2.5.0] - 2024-11-04
 
 * Use updated Service trait

ntex-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-server"
-version = "2.5.0"
+version = "2.6.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Server for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -18,9 +18,9 @@ path = "src/lib.rs"
 [dependencies]
 ntex-bytes = "0.1"
 ntex-net = "2"
-ntex-service = "3.3"
+ntex-service = "3.4"
 ntex-rt = "0.4"
-ntex-util = "2.5"
+ntex-util = "2.8"
 
 async-channel = "2"
 async-broadcast = "0.7"

ntex-server/src/net/service.rs

@@ -1,4 +1,4 @@
-use std::{fmt, future::poll_fn, future::Future, pin::Pin, task::Poll};
+use std::{fmt, task::Context};
 
 use ntex_bytes::{Pool, PoolRef};
 use ntex_net::Io;
@@ -170,27 +170,11 @@ impl Service<Connection> for StreamServiceImpl {
     }
 
     #[inline]
-    async fn not_ready(&self) {
-        if self.conns.is_available() {
-            let mut futs: Vec<_> = self
-                .services
-                .iter()
-                .map(|s| Box::pin(s.not_ready()))
-                .collect();
-
-            ntex_util::future::select(
-                self.conns.unavailable(),
-                poll_fn(move |cx| {
-                    for f in &mut futs {
-                        if Pin::new(f).poll(cx).is_ready() {
-                            return Poll::Ready(());
-                        }
-                    }
-                    Poll::Pending
-                }),
-            )
-            .await;
+    fn poll(&self, cx: &mut Context<'_>) -> Result<(), Self::Error> {
+        for svc in &self.services {
+            svc.poll(cx)?;
         }
+        Ok(())
     }
 
     async fn shutdown(&self) {