Use updated Service trait (#450)

ntex-service/src/and_then.rs

@@ -31,7 +31,7 @@ where
     }
 
     #[inline]
-    async fn not_ready(&self) -> Result<(), Self::Error> {
+    async fn not_ready(&self) {
         util::select(self.svc1.not_ready(), self.svc2.not_ready()).await
     }
 
@@ -88,6 +88,7 @@ where
 
 #[cfg(test)]
 mod tests {
+    use ntex_util::time;
     use std::{cell::Cell, rc::Rc};
 
     use crate::{chain, chain_factory, fn_factory, Service, ServiceCtx};
@@ -104,6 +105,11 @@ mod tests {
             Ok(())
         }
 
+        async fn not_ready(&self) {
+            self.0.set(self.0.get() + 1);
+            std::future::pending().await
+        }
+
         async fn call(
             &self,
             req: &'static str,
@@ -129,6 +135,11 @@ mod tests {
             Ok(())
         }
 
+        async fn not_ready(&self) {
+            self.0.set(self.0.get() + 1);
+            std::future::pending().await
+        }
+
         async fn call(
             &self,
             req: &'static str,
@@ -155,6 +166,14 @@ mod tests {
         let res = srv.ready().await;
         assert_eq!(res, Ok(()));
         assert_eq!(cnt.get(), 2);
+
+        let srv2 = srv.clone();
+        ntex::rt::spawn(async move {
+            let _ = srv2.not_ready().await;
+        });
+        time::sleep(time::Millis(25)).await;
+        assert_eq!(cnt.get(), 4);
+
         srv.shutdown().await;
         assert_eq!(cnt_sht.get(), 2);
     }

ntex-service/src/apply.rs

@@ -104,16 +104,6 @@ where
         self.service.ready().await.map_err(From::from)
     }
 
-    #[inline]
-    async fn not_ready(&self) -> Result<(), Err> {
-        self.service.get_ref().not_ready().await.map_err(From::from)
-    }
-
-    #[inline]
-    async fn shutdown(&self) {
-        self.service.shutdown().await
-    }
-
     #[inline]
     async fn call(
         &self,
@@ -122,6 +112,9 @@ where
     ) -> Result<Self::Response, Self::Error> {
         (self.f)(req, self.service.clone()).await
     }
+
+    crate::forward_notready!(service);
+    crate::forward_shutdown!(service);
 }
 
 /// `apply()` service factory
@@ -228,6 +221,10 @@ mod tests {
             Ok(())
         }
 
+        async fn not_ready(&self) {
+            self.0.set(self.0.get() + 1);
+        }
+
         async fn shutdown(&self) {
             self.0.set(self.0.get() + 1);
         }
@@ -256,9 +253,12 @@ mod tests {
 
         assert_eq!(srv.ready().await, Ok::<_, Err>(()));
 
-        srv.shutdown().await;
+        srv.not_ready().await;
         assert_eq!(cnt_sht.get(), 1);
 
+        srv.shutdown().await;
+        assert_eq!(cnt_sht.get(), 2);
+
         let res = srv.call("srv").await;
         assert!(res.is_ok());
         assert_eq!(res.unwrap(), ("srv", ()));

ntex-service/src/boxed.rs

@@ -54,7 +54,7 @@ trait ServiceObj<Req> {
         waiters: &'a WaitersRef,
     ) -> BoxFuture<'a, (), Self::Error>;
 
-    fn not_ready(&self) -> BoxFuture<'_, (), Self::Error>;
+    fn not_ready<'a>(&'a self) -> Pin<Box<dyn Future<Output = ()> + 'a>>;
 
     fn call<'a>(
         &'a self,
@@ -84,7 +84,7 @@ where
     }
 
     #[inline]
-    fn not_ready(&self) -> BoxFuture<'_, (), Self::Error> {
+    fn not_ready<'a>(&'a self) -> Pin<Box<dyn Future<Output = ()> + 'a>> {
         Box::pin(crate::Service::not_ready(self))
     }
 
@@ -159,7 +159,7 @@ where
     }
 
     #[inline]
-    async fn not_ready(&self) -> Result<(), Self::Error> {
+    async fn not_ready(&self) {
         self.0.not_ready().await
     }
 

ntex-service/src/lib.rs

@@ -120,7 +120,7 @@ pub trait Service<Req> {
 
     #[inline]
     /// Returns when the service is not able to process requests.
-    async fn not_ready(&self) -> Result<(), Self::Error> {
+    async fn not_ready(&self) {
         std::future::pending().await
     }
 
@@ -253,7 +253,7 @@ where
     }
 
     #[inline]
-    async fn not_ready(&self) -> Result<(), S::Error> {
+    async fn not_ready(&self) {
         (**self).not_ready().await
     }
 
@@ -285,7 +285,7 @@ where
     }
 
     #[inline]
-    async fn not_ready(&self) -> Result<(), S::Error> {
+    async fn not_ready(&self) {
         (**self).not_ready().await
     }
 

ntex-service/src/macros.rs

@@ -13,11 +13,8 @@ macro_rules! forward_ready {
         }
 
         #[inline]
-        async fn not_ready(&self) -> Result<(), Self::Error> {
-            self.$field
-                .not_ready()
-                .await
-                .map_err(::core::convert::Into::into)
+        async fn not_ready(&self) {
+            self.$field.not_ready().await
         }
     };
     ($field:ident, $err:expr) => {
@@ -30,8 +27,19 @@ macro_rules! forward_ready {
         }
 
         #[inline]
-        async fn not_ready(&self) -> Result<(), Self::Error> {
-            self.$field.not_ready().await.map_err($err)
+        async fn not_ready(&self) {
+            self.$field.not_ready().await
+        }
+    };
+}
+
+/// An implementation of [`not_ready`] that forwards not_ready call to a field.
+#[macro_export]
+macro_rules! forward_notready {
+    ($field:ident) => {
+        #[inline]
+        async fn not_ready(&self) {
+            self.$field.not_ready().await
         }
     };
 }

ntex-service/src/map_err.rs

@@ -67,11 +67,6 @@ where
         ctx.ready(&self.service).await.map_err(&self.f)
     }
 
-    #[inline]
-    async fn not_ready(&self) -> Result<(), Self::Error> {
-        self.service.not_ready().await.map_err(&self.f)
-    }
-
     #[inline]
     async fn call(
         &self,
@@ -82,6 +77,7 @@ where
     }
 
     crate::forward_shutdown!(service);
+    crate::forward_notready!(service);
 }
 
 /// Factory for the `map_err` combinator, changing the type of a new

ntex-service/src/pipeline.rs

@@ -40,7 +40,7 @@ impl<S> Pipeline<S> {
     }
 
     #[inline]
-    /// Returns when the service is able to process requests.
+    /// Returns when the pipeline is able to process requests.
     pub async fn ready<R>(&self) -> Result<(), S::Error>
     where
         S: Service<R>,
@@ -50,6 +50,15 @@ impl<S> Pipeline<S> {
             .await
     }
 
+    #[inline]
+    /// Returns when the pipeline is not able to process requests.
+    pub async fn not_ready<R>(&self)
+    where
+        S: Service<R>,
+    {
+        self.state.svc.not_ready().await
+    }
+
     #[inline]
     /// Wait for service readiness and then create future object
     /// that resolves to service result.
@@ -160,7 +169,7 @@ where
 {
     pl: Pipeline<S>,
     st: cell::UnsafeCell<State<S::Error>>,
-    not_ready: cell::UnsafeCell<StateNotReady<S::Error>>,
+    not_ready: cell::UnsafeCell<StateNotReady>,
 }
 
 enum State<E> {
@@ -169,9 +178,9 @@ enum State<E> {
     Shutdown(Pin<Box<dyn Future<Output = ()> + 'static>>),
 }
 
-enum StateNotReady<E> {
+enum StateNotReady {
     New,
-    Readiness(Pin<Box<dyn Future<Output = Result<(), E>> + 'static>>),
+    Readiness(Pin<Box<dyn Future<Output = ()>>>),
 }
 
 impl<S, R> PipelineBinding<S, R>
@@ -221,7 +230,7 @@ where
 
     #[inline]
     /// Returns when the pipeline is not able to process requests.
-    pub fn poll_not_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), S::Error>> {
+    pub fn poll_not_ready(&self, cx: &mut Context<'_>) -> Poll<()> {
         let st = unsafe { &mut *self.not_ready.get() };
 
         match st {
@@ -375,7 +384,7 @@ where
         .ready(ServiceCtx::<'_, S>::new(pl.index, pl.state.waiters_ref()))
 }
 
-fn not_ready<S, R>(pl: &'static Pipeline<S>) -> impl Future<Output = Result<(), S::Error>>
+fn not_ready<S, R>(pl: &'static Pipeline<S>) -> impl Future<Output = ()>
 where
     S: Service<R>,
     R: 'static,

ntex-service/src/then.rs

@@ -31,7 +31,7 @@ where
     }
 
     #[inline]
-    async fn not_ready(&self) -> Result<(), Self::Error> {
+    async fn not_ready(&self) {
         util::select(self.svc1.not_ready(), self.svc2.not_ready()).await
     }
 
@@ -91,6 +91,7 @@ where
 
 #[cfg(test)]
 mod tests {
+    use ntex_util::time;
     use std::{cell::Cell, rc::Rc};
 
     use crate::{chain, chain_factory, fn_factory, Service, ServiceCtx};
@@ -107,6 +108,11 @@ mod tests {
             Ok(())
         }
 
+        async fn not_ready(&self) {
+            self.0.set(self.0.get() + 1);
+            std::future::pending().await
+        }
+
         async fn call(
             &self,
             req: Result<&'static str, &'static str>,
@@ -135,6 +141,11 @@ mod tests {
             Ok(())
         }
 
+        async fn not_ready(&self) {
+            self.0.set(self.0.get() + 1);
+            std::future::pending().await
+        }
+
         async fn call(
             &self,
             req: Result<&'static str, ()>,
@@ -161,6 +172,14 @@ mod tests {
         let res = srv.ready().await;
         assert_eq!(res, Ok(()));
         assert_eq!(cnt.get(), 2);
+
+        let srv2 = srv.clone();
+        ntex::rt::spawn(async move {
+            let _ = srv2.not_ready().await;
+        });
+        time::sleep(time::Millis(25)).await;
+        assert_eq!(cnt.get(), 4);
+
         srv.shutdown().await;
         assert_eq!(cnt_sht.get(), 2);
     }