actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-02-25 15:02:50 +01:00
Code Issues Releases Wiki Activity

rename StreamServiceFactory to ServiceFactory

Browse Source
This commit is contained in:
Nikolay Kim 2019-03-04 14:31:46 -08:00
parent 82930de8e7
commit 9f25fdf929
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actix-server/CHANGES.md
View File

@ -1,5 +1,14 @@
# Changes # Changes
## [0.3.1] - 2019-03-xx
### Changed
* Rename `StreamServiceFactory` to `ServiceFactory`
* Deprecate `StreamServiceFactory`
## [0.3.0] - 2019-03-02 ## [0.3.0] - 2019-03-02
### Changed ### Changed

6
actix-server/src/builder.rs
View File

@ -14,7 +14,7 @@ use tokio_timer::sleep;
use crate::accept::{AcceptLoop, AcceptNotify, Command}; use crate::accept::{AcceptLoop, AcceptNotify, Command};
use crate::config::{ConfiguredService, ServiceConfig}; use crate::config::{ConfiguredService, ServiceConfig};
use crate::server::{Server, ServerCommand}; use crate::server::{Server, ServerCommand};
use crate::services::{InternalServiceFactory, StreamNewService, StreamServiceFactory}; use crate::services::{InternalServiceFactory, ServiceFactory, StreamNewService};
use crate::signals::{Signal, Signals}; use crate::signals::{Signal, Signals};
use crate::worker::{self, Worker, WorkerAvailability, WorkerClient}; use crate::worker::{self, Worker, WorkerAvailability, WorkerClient};
use crate::Token; use crate::Token;
@ -137,7 +137,7 @@ impl ServerBuilder {
/// Add new service to the server. /// Add new service to the server.
pub fn bind<F, U, N: AsRef<str>>(mut self, name: N, addr: U, factory: F) -> io::Result<Self> pub fn bind<F, U, N: AsRef<str>>(mut self, name: N, addr: U, factory: F) -> io::Result<Self>
where where
F: StreamServiceFactory, F: ServiceFactory,
U: net::ToSocketAddrs, U: net::ToSocketAddrs,
{ {
let sockets = bind_addr(addr)?; let sockets = bind_addr(addr)?;
@ -163,7 +163,7 @@ impl ServerBuilder {
factory: F, factory: F,
) -> Self ) -> Self
where where
F: StreamServiceFactory, F: ServiceFactory,
{ {
let token = self.token.next(); let token = self.token.next();
self.services.push(StreamNewService::create( self.services.push(StreamNewService::create(

5
actix-server/src/lib.rs
View File

@ -13,7 +13,10 @@ mod worker;
pub use self::builder::ServerBuilder; pub use self::builder::ServerBuilder;
pub use self::config::{ServiceConfig, ServiceRuntime}; pub use self::config::{ServiceConfig, ServiceRuntime};
pub use self::server::Server; pub use self::server::Server;
pub use self::services::StreamServiceFactory; pub use self::services::ServiceFactory;
#[doc(hidden)]
pub use self::services::ServiceFactory as StreamServiceFactory;
/// Socket id token /// Socket id token
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]

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

@ -22,7 +22,7 @@ pub(crate) enum ServerMessage {
ForceShutdown, ForceShutdown,
} }
pub trait StreamServiceFactory: Send + Clone + 'static { pub trait ServiceFactory: Send + Clone + 'static {
type NewService: NewService<Request = TcpStream>; type NewService: NewService<Request = TcpStream>;
fn create(&self) -> Self::NewService; fn create(&self) -> Self::NewService;
@ -92,7 +92,7 @@ where
} }
} }
pub(crate) struct StreamNewService<F: StreamServiceFactory> { pub(crate) struct StreamNewService<F: ServiceFactory> {
name: String, name: String,
inner: F, inner: F,
token: Token, token: Token,
@ -100,7 +100,7 @@ pub(crate) struct StreamNewService<F: StreamServiceFactory> {
impl<F> StreamNewService<F> impl<F> StreamNewService<F>
where where
F: StreamServiceFactory, F: ServiceFactory,
{ {
pub(crate) fn create(name: String, token: Token, inner: F) -> Box<InternalServiceFactory> { pub(crate) fn create(name: String, token: Token, inner: F) -> Box<InternalServiceFactory> {
Box::new(Self { name, token, inner }) Box::new(Self { name, token, inner })
@ -109,7 +109,7 @@ where
impl<F> InternalServiceFactory for StreamNewService<F> impl<F> InternalServiceFactory for StreamNewService<F>
where where
F: StreamServiceFactory, F: ServiceFactory,
{ {
fn name(&self, _: Token) -> &str { fn name(&self, _: Token) -> &str {
&self.name &self.name
@ -152,7 +152,7 @@ impl InternalServiceFactory for Box<InternalServiceFactory> {
} }
} }
impl<F, T> StreamServiceFactory 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 = TcpStream>, T: NewService<Request = TcpStream>,