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

Refactor Server service configuration

Browse source
This commit is contained in:
Nikolay Kim 2021-12-20 19:54:04 +06:00
parent 4af1567df1
commit fe064115ad
4 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ntex/src/http/test.rs
View file

@ -4,9 +4,7 @@ use std::{convert::TryFrom, io, net, str::FromStr, sync::mpsc, thread};
#[cfg(feature = "cookie")]
use coo_kie::{Cookie, CookieJar};
use crate::{
io::Io, rt::System, server::Server, server::ServiceConfig, service::ServiceFactory,
};
use crate::{io::Io, rt::System, server::Server, service::ServiceFactory};
use crate::{time::Millis, time::Seconds, util::Bytes};
use super::client::error::WsClientError;
@ -212,7 +210,7 @@ fn parts(parts: &mut Option<Inner>) -> &mut Inner {
/// ```
pub fn server<F, R>(factory: F) -> TestServer
where
F: Fn(ServiceConfig) -> R + Send + Clone + 'static,
F: Fn() -> R + Send + Clone + 'static,
R: ServiceFactory<Config = (), Request = Io>,
{
let (tx, rx) = mpsc::channel();
@ -225,7 +223,7 @@ where
sys.exec(|| {
Server::build()
.listen("test", tcp, factory)?
.listen("test", tcp, move |_| factory())?
.workers(1)
.disable_signals()
.run();

6
ntex/src/server/test.rs
View file

@ -4,7 +4,7 @@ use std::{io, net, sync::mpsc, thread};
use socket2::{Domain, SockAddr, Socket, Type};
use crate::rt::{tcp_connect, System};
use crate::server::{Server, ServerBuilder, ServiceConfig};
use crate::server::{Server, ServerBuilder};
use crate::{io::Io, service::ServiceFactory};
/// Start test server
@ -40,7 +40,7 @@ use crate::{io::Io, service::ServiceFactory};
/// ```
pub fn test_server<F, R>(factory: F) -> TestServer
where
F: Fn(ServiceConfig) -> R + Send + Clone + 'static,
F: Fn() -> R + Send + Clone + 'static,
R: ServiceFactory<Config = (), Request = Io>,
{
let (tx, rx) = mpsc::channel();
@ -53,7 +53,7 @@ where
sys.exec(|| {
Server::build()
.listen("test", tcp, factory)?
.listen("test", tcp, move |_| factory())?
.workers(1)
.disable_signals()
.run();

4
ntex/src/server/worker.rs
View file

@ -592,7 +592,7 @@ mod tests {
vec![Factory::create(
"test".to_string(),
Token(0),
move || f.clone(),
move |_| f.clone(),
"127.0.0.1:8080".parse().unwrap(),
)],
avail.clone(),
@ -664,7 +664,7 @@ mod tests {
vec![Factory::create(
"test".to_string(),
Token(0),
move || f.clone(),
move |_| f.clone(),
"127.0.0.1:8080".parse().unwrap(),
)],
avail.clone(),

20
ntex/tests/server.rs
View file

@ -21,9 +21,9 @@ fn test_bind() {
Server::build()
.workers(1)
.disable_signals()
.bind("test", addr, move || fn_service(|_| ok::<_, ()>(())))
.bind("test", addr, move |_| fn_service(|_| ok::<_, ()>(())))
.unwrap()
.start()
.run()
});
let _ = tx.send((srv, ntex::rt::System::current()));
let _ = sys.run();
@ -48,9 +48,9 @@ fn test_listen() {
Server::build()
.disable_signals()
.workers(1)
.listen("test", lst, move || fn_service(|_| ok::<_, ()>(())))
.listen("test", lst, move |_| fn_service(|_| ok::<_, ()>(())))
.unwrap()
.start()
.run()
});
let _ = tx.send(ntex::rt::System::current());
let _ = sys.run();
@ -65,7 +65,7 @@ fn test_listen() {
#[test]
#[cfg(unix)]
fn test_start() {
fn test_run() {
let addr = TestServer::unused_addr();
let (tx, rx) = mpsc::channel();
@ -75,7 +75,7 @@ fn test_start() {
Server::build()
.backlog(100)
.disable_signals()
.bind("test", addr, move || {
.bind("test", addr, move |_| {
fn_service(|io: Io| async move {
io.send(Bytes::from_static(b"test"), &BytesCodec)
.await
@ -84,7 +84,7 @@ fn test_start() {
})
})
.unwrap()
.start()
.run()
});
let _ = tx.send((srv, ntex::rt::System::current()));
@ -170,7 +170,7 @@ fn test_on_worker_start() {
Ready::Ok::<_, io::Error>(())
})
.workers(1)
.start()
.run()
});
let _ = tx.send((srv, ntex::rt::System::current()));
let _ = sys.run();
@ -203,7 +203,7 @@ fn test_panic_in_worker() {
Server::build()
.workers(1)
.disable_signals()
.bind("test", addr, move || {
.bind("test", addr, move |_| {
let counter = counter.clone();
fn_service(move |_| {
counter.fetch_add(1, Relaxed);
@ -212,7 +212,7 @@ fn test_panic_in_worker() {
})
})
.unwrap()
.start()
.run()
});
let _ = tx.send((srv.clone(), ntex::rt::System::current()));
sys.exec(move || ntex::rt::spawn(srv.map(|_| ())));