actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-01-31 11:32:10 +01:00
Code Issues Releases Wiki Activity

drop server service errors

Browse Source
This commit is contained in:
Nikolay Kim 2018-09-28 12:22:49 -07:00
parent 1745a575a5
commit fc7c436387
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/server/services.rs
View File

@ -21,18 +21,13 @@ pub enum ServerMessage {
} }
pub trait StreamServiceFactory: Send + Clone + 'static { pub trait StreamServiceFactory: Send + Clone + 'static {
type NewService: NewService<Request = TcpStream, Response = (), Error = (), InitError = ()>; type NewService: NewService<Request = TcpStream, Response = ()>;
fn create(&self) -> Self::NewService; fn create(&self) -> Self::NewService;
} }
pub trait ServiceFactory: Send + Clone + 'static { pub trait ServiceFactory: Send + Clone + 'static {
type NewService: NewService< type NewService: NewService<Request = ServerMessage, Response = ()>;
Request = ServerMessage,
Response = (),
Error = (),
InitError = (),
>;
fn create(&self) -> Self::NewService; fn create(&self) -> Self::NewService;
} }
@ -66,7 +61,7 @@ impl<T> StreamService<T> {
impl<T> Service for StreamService<T> impl<T> Service for StreamService<T>
where where
T: Service<Request = TcpStream, Response = (), Error = ()>, T: Service<Request = TcpStream, Response = ()>,
T::Future: 'static, T::Future: 'static,
T::Error: 'static, T::Error: 'static,
{ {
@ -87,7 +82,7 @@ where
}); });
if let Ok(stream) = stream { if let Ok(stream) = stream {
spawn(self.service.call(stream).map(move |val| { spawn(self.service.call(stream).map_err(|_| ()).map(move |val| {
drop(guard); drop(guard);
val val
})); }));
@ -113,7 +108,7 @@ impl<T> ServerService<T> {
impl<T> Service for ServerService<T> impl<T> Service for ServerService<T>
where where
T: Service<Request = ServerMessage, Response = (), Error = ()>, T: Service<Request = ServerMessage, Response = ()>,
T::Future: 'static, T::Future: 'static,
T::Error: 'static, T::Error: 'static,
{ {
@ -127,7 +122,7 @@ where
} }
fn call(&mut self, (guard, req): (Option<CounterGuard>, ServerMessage)) -> Self::Future { fn call(&mut self, (guard, req): (Option<CounterGuard>, ServerMessage)) -> Self::Future {
spawn(self.service.call(req).map(move |val| { spawn(self.service.call(req).map_err(|_| ()).map(move |val| {
drop(guard); drop(guard);
val val
})); }));
@ -165,10 +160,16 @@ where
} }
fn create(&self) -> Box<Future<Item = BoxedServerService, Error = ()>> { fn create(&self) -> Box<Future<Item = BoxedServerService, Error = ()>> {
Box::new(self.inner.create().new_service().map(move |inner| { Box::new(
self.inner
.create()
.new_service()
.map_err(|_| ())
.map(move |inner| {
let service: BoxedServerService = Box::new(ServerService::new(inner)); let service: BoxedServerService = Box::new(ServerService::new(inner));
service service
})) }),
)
} }
} }
@ -202,10 +203,16 @@ where
} }
fn create(&self) -> Box<Future<Item = BoxedServerService, Error = ()>> { fn create(&self) -> Box<Future<Item = BoxedServerService, Error = ()>> {
Box::new(self.inner.create().new_service().map(move |inner| { Box::new(
self.inner
.create()
.new_service()
.map_err(|_| ())
.map(move |inner| {
let service: BoxedServerService = Box::new(StreamService::new(inner)); let service: BoxedServerService = Box::new(StreamService::new(inner));
service service
})) }),
)
} }
} }
@ -226,7 +233,7 @@ impl InternalServiceFactory for Box<InternalServiceFactory> {
impl<F, T> ServiceFactory for F impl<F, T> ServiceFactory for F
where where
F: Fn() -> T + Send + Clone + 'static, F: Fn() -> T + Send + Clone + 'static,
T: NewService<Request = ServerMessage, Response = (), Error = (), InitError = ()>, T: NewService<Request = ServerMessage, Response = ()>,
{ {
type NewService = T; type NewService = T;
@ -238,7 +245,7 @@ where
impl<F, T> StreamServiceFactory for F impl<F, T> StreamServiceFactory for F
where where
F: Fn() -> T + Send + Clone + 'static, F: Fn() -> T + Send + Clone + 'static,
T: NewService<Request = TcpStream, Response = (), Error = (), InitError = ()>, T: NewService<Request = TcpStream, Response = ()>,
{ {
type NewService = T; type NewService = T;