mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 21:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use async fn for Service::ready() and Service::shutdown() (#363)

Browse source
This commit is contained in:
Nikolay Kim 2024-05-28 16:55:08 +05:00 • committed by GitHub
parent dec6ab083a
commit b04bdf41f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 285 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ntex-util/src/services/timeout.rs
View file

@ -4,7 +4,7 @@
//! will be aborted.
use std::{fmt, marker};
use ntex_service::{IntoService, Middleware, Service, ServiceCtx};
use ntex_service::{Middleware, Service, ServiceCtx};
use crate::future::{select, Either};
use crate::time::{sleep, Millis};
@ -104,15 +104,14 @@ pub struct TimeoutService<S> {
}
impl<S> TimeoutService<S> {
pub fn new<T, U, R>(timeout: T, service: U) -> Self
pub fn new<T, R>(timeout: T, service: S) -> Self
where
T: Into<Millis>,
S: Service<R>,
U: IntoService<S, R>,
{
TimeoutService {
service,
timeout: timeout.into(),
service: service.into_service(),
}
}
}
@ -141,8 +140,8 @@ where
}
}
ntex_service::forward_poll_ready!(service, TimeoutError::Service);
ntex_service::forward_poll_shutdown!(service);
ntex_service::forward_ready!(service, TimeoutError::Service);
ntex_service::forward_shutdown!(service);
}
#[cfg(test)]
@ -152,7 +151,6 @@ mod tests {
use ntex_service::{apply, fn_factory, Pipeline, ServiceFactory};
use super::*;
use crate::future::lazy;
#[derive(Clone, Debug, PartialEq)]
struct SleepService(Duration);
@ -184,8 +182,8 @@ mod tests {
let timeout =
Pipeline::new(TimeoutService::new(resolution, SleepService(wait_time)).clone());
assert_eq!(timeout.call(()).await, Ok(()));
assert!(lazy(|cx| timeout.poll_ready(cx)).await.is_ready());
assert!(lazy(|cx| timeout.poll_shutdown(cx)).await.is_ready());
assert_eq!(timeout.ready().await, Ok(()));
assert_eq!(timeout.shutdown().await, ());
}
#[ntex_macros::rt_test2]
@ -196,7 +194,7 @@ mod tests {
let timeout =
Pipeline::new(TimeoutService::new(resolution, SleepService(wait_time)));
assert_eq!(timeout.call(()).await, Ok(()));
assert!(lazy(|cx| timeout.poll_ready(cx)).await.is_ready());
assert_eq!(timeout.ready().await, Ok(()));
}
#[ntex_macros::rt_test2]