actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-27 18:02:58 +01:00
Code Issues Releases Wiki Activity

Drop service response

Browse Source
This commit is contained in:
Nikolay Kim 2019-02-09 21:39:17 -08:00
parent a53f06a1a4
commit e354c6df92
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
actix-server/CHANGES.md
View File

@ -1,8 +1,15 @@
# Changes
## [0.2.1] - 2019-02-09
### Changes
* Drop service response
## [0.2.0] - 2019-02-01
## Changes
### Changes
* Migrate to actix-service 0.2
@ -11,14 +18,14 @@
## [0.1.3] - 2018-12-21
## Fixed
### Fixed
* Fix max concurrent connections handling
## [0.1.2] - 2018-12-12
## Changed
### Changed
* rename ServiceConfig::rt() to ServiceConfig::apply()

4
actix-server/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "actix-server"
version = "0.2.0"
version = "0.2.1"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix server - General purpose tcp server"
keywords = ["network", "framework", "async", "futures"]
@ -33,7 +33,7 @@ ssl = ["openssl", "tokio-openssl"]
rust-tls = ["rustls", "tokio-rustls", "webpki", "webpki-roots"]
[dependencies]
actix-service = "0.2.0"
actix-service = "0.2.1"
actix-rt = "0.1.0"
log = "0.4"

16
actix-server/src/services.rs
View File

@ -23,13 +23,13 @@ pub enum ServerMessage {
}
pub trait StreamServiceFactory: Send + Clone + 'static {
type NewService: NewService<Request = TcpStream, Response = ()>;
type NewService: NewService<Request = TcpStream>;
fn create(&self) -> Self::NewService;
}
pub trait ServiceFactory: Send + Clone + 'static {
type NewService: NewService<Request = ServerMessage, Response = ()>;
type NewService: NewService<Request = ServerMessage>;
fn create(&self) -> Self::NewService;
}
@ -63,7 +63,7 @@ impl<T> StreamService<T> {
impl<T> Service for StreamService<T>
where
T: Service<Request = TcpStream, Response = ()>,
T: Service<Request = TcpStream>,
T::Future: 'static,
T::Error: 'static,
{
@ -86,7 +86,7 @@ where
if let Ok(stream) = stream {
spawn(self.service.call(stream).then(move |res| {
drop(guard);
res.map_err(|_| ())
res.map_err(|_| ()).map(|_| ())
}));
ok(())
} else {
@ -110,7 +110,7 @@ impl<T> ServerService<T> {
impl<T> Service for ServerService<T>
where
T: Service<Request = ServerMessage, Response = ()>,
T: Service<Request = ServerMessage>,
T::Future: 'static,
T::Error: 'static,
{
@ -126,7 +126,7 @@ where
fn call(&mut self, (guard, req): (Option<CounterGuard>, ServerMessage)) -> Self::Future {
spawn(self.service.call(req).then(move |res| {
drop(guard);
res.map_err(|_| ())
res.map_err(|_| ()).map(|_| ())
}));
ok(())
}
@ -241,7 +241,7 @@ impl InternalServiceFactory for Box<InternalServiceFactory> {
impl<F, T> ServiceFactory for F
where
F: Fn() -> T + Send + Clone + 'static,
T: NewService<Request = ServerMessage, Response = ()>,
T: NewService<Request = ServerMessage>,
{
type NewService = T;
@ -253,7 +253,7 @@ where
impl<F, T> StreamServiceFactory for F
where
F: Fn() -> T + Send + Clone + 'static,
T: NewService<Request = TcpStream, Response = ()>,
T: NewService<Request = TcpStream>,
{
type NewService = T;