cleanup names

ntex/src/http/h1/dispatcher.rs

@@ -989,7 +989,6 @@ mod tests {
 
     #[crate::rt_test]
     async fn test_write_backpressure() {
-        env_logger::init();
         let num = Arc::new(AtomicUsize::new(0));
         let num2 = num.clone();
 

ntex/src/server/builder.rs

@@ -15,7 +15,7 @@ use crate::{time::sleep, time::Millis, util::join_all};
 
 use super::accept::{AcceptLoop, AcceptNotify, Command};
 use super::config::{
-    ConfigWrapper, Configuration, ConfiguredService, RuntimeConfiguration, ServiceConfig,
+    Config, ConfigWrapper, ConfiguredService, ServiceConfig, ServiceRuntime,
 };
 use super::service::{Factory, InternalServiceFactory};
 use super::socket::Listener;
@@ -151,9 +151,9 @@ impl ServerBuilder {
     /// different module or even library.
     pub fn configure<F>(mut self, f: F) -> io::Result<ServerBuilder>
     where
-        F: Fn(&mut Configuration) -> io::Result<()>,
+        F: Fn(&mut ServiceConfig) -> io::Result<()>,
     {
-        let mut cfg = Configuration::new(self.threads, self.backlog);
+        let mut cfg = ServiceConfig::new(self.threads, self.backlog);
 
         f(&mut cfg)?;
 
@@ -176,7 +176,7 @@ impl ServerBuilder {
     /// It get executed in the worker thread.
     pub fn on_worker_start<F, R, E>(mut self, f: F) -> Self
     where
-        F: Fn(RuntimeConfiguration) -> R + Send + Clone + 'static,
+        F: Fn(ServiceRuntime) -> R + Send + Clone + 'static,
         R: Future<Output = Result<(), E>> + 'static,
         E: fmt::Display + 'static,
     {
@@ -197,7 +197,7 @@ impl ServerBuilder {
     ) -> io::Result<Self>
     where
         U: net::ToSocketAddrs,
-        F: Fn(ServiceConfig) -> R + Send + Clone + 'static,
+        F: Fn(Config) -> R + Send + Clone + 'static,
         R: ServiceFactory<Config = (), Request = Io>,
     {
         let sockets = bind_addr(addr, self.backlog)?;
@@ -225,7 +225,7 @@ impl ServerBuilder {
     where
         N: AsRef<str>,
         U: AsRef<std::path::Path>,
-        F: Fn(ServiceConfig) -> R + Send + Clone + 'static,
+        F: Fn(Config) -> R + Send + Clone + 'static,
         R: ServiceFactory<Config = (), Request = Io>,
     {
         use std::os::unix::net::UnixListener;
@@ -254,7 +254,7 @@ impl ServerBuilder {
         factory: F,
     ) -> io::Result<Self>
     where
-        F: Fn(ServiceConfig) -> R + Send + Clone + 'static,
+        F: Fn(Config) -> R + Send + Clone + 'static,
         R: ServiceFactory<Config = (), Request = Io>,
     {
         use std::net::{IpAddr, Ipv4Addr, SocketAddr};
@@ -279,7 +279,7 @@ impl ServerBuilder {
         factory: F,
     ) -> io::Result<Self>
     where
-        F: Fn(ServiceConfig) -> R + Send + Clone + 'static,
+        F: Fn(Config) -> R + Send + Clone + 'static,
         R: ServiceFactory<Config = (), Request = Io>,
     {
         let token = self.token.next();

ntex/src/server/config.rs

@@ -15,13 +15,13 @@ use super::service::{
 use super::Token;
 
 #[derive(Clone)]
-pub struct ServiceConfig(pub(super) Rc<InnerServiceConfig>);
+pub struct Config(pub(super) Rc<InnerServiceConfig>);
 
 pub(super) struct InnerServiceConfig {
     pub(super) pool: Cell<PoolId>,
 }
 
-impl Default for ServiceConfig {
+impl Default for Config {
     fn default() -> Self {
         Self(Rc::new(InnerServiceConfig {
             pool: Cell::new(PoolId::DEFAULT),
@@ -29,7 +29,7 @@ impl Default for ServiceConfig {
     }
 }
 
-impl ServiceConfig {
+impl Config {
     /// Set memory pool for the service.
     ///
     /// Use specified memory pool for memory allocations.
@@ -39,7 +39,7 @@ impl ServiceConfig {
     }
 }
 
-pub struct Configuration {
+pub struct ServiceConfig {
     pub(super) services: Vec<(String, net::TcpListener)>,
     pub(super) apply: Box<dyn ServiceRuntimeConfiguration + Send>,
     pub(super) threads: usize,
@@ -47,9 +47,9 @@ pub struct Configuration {
     applied: bool,
 }
 
-impl Configuration {
+impl ServiceConfig {
     pub(super) fn new(threads: usize, backlog: i32) -> Self {
-        Configuration {
+        ServiceConfig {
             threads,
             backlog,
             services: Vec::new(),
@@ -103,7 +103,7 @@ impl Configuration {
     /// It get executed in the worker thread.
     pub fn on_worker_start<F, R, E>(&mut self, f: F) -> io::Result<()>
     where
-        F: Fn(RuntimeConfiguration) -> R + Send + Clone + 'static,
+        F: Fn(ServiceRuntime) -> R + Send + Clone + 'static,
         R: Future<Output = Result<(), E>> + 'static,
         E: fmt::Display + 'static,
     {
@@ -156,8 +156,8 @@ impl InternalServiceFactory for ConfiguredService {
     ) -> Pin<Box<dyn Future<Output = Result<Vec<(Token, BoxedServerService)>, ()>>>>
     {
         // configure services
-        let rt = RuntimeConfiguration::new(self.topics.clone());
-        let cfg_fut = self.rt.configure(RuntimeConfiguration(rt.0.clone()));
+        let rt = ServiceRuntime::new(self.topics.clone());
+        let cfg_fut = self.rt.configure(ServiceRuntime(rt.0.clone()));
         let mut names = self.names.clone();
         let tokens = self.services.clone();
 
@@ -208,7 +208,7 @@ pub(super) trait ServiceRuntimeConfiguration {
 
     fn configure(
         &self,
-        rt: RuntimeConfiguration,
+        rt: ServiceRuntime,
     ) -> Pin<Box<dyn Future<Output = Result<(), ()>>>>;
 }
 
@@ -222,7 +222,7 @@ unsafe impl<F: Send, R, E> Send for ConfigWrapper<F, R, E> {}
 
 impl<F, R, E> ServiceRuntimeConfiguration for ConfigWrapper<F, R, E>
 where
-    F: Fn(RuntimeConfiguration) -> R + Send + Clone + 'static,
+    F: Fn(ServiceRuntime) -> R + Send + Clone + 'static,
     R: Future<Output = Result<(), E>> + 'static,
     E: fmt::Display + 'static,
 {
@@ -235,7 +235,7 @@ where
 
     fn configure(
         &self,
-        rt: RuntimeConfiguration,
+        rt: ServiceRuntime,
     ) -> Pin<Box<dyn Future<Output = Result<(), ()>>>> {
         let f = self.f.clone();
         Box::pin(async move {
@@ -250,7 +250,7 @@ fn not_configured() {
     error!("Service is not configured");
 }
 
-pub struct RuntimeConfiguration(Rc<RefCell<ServiceRuntimeInner>>);
+pub struct ServiceRuntime(Rc<RefCell<ServiceRuntimeInner>>);
 
 struct ServiceRuntimeInner {
     names: HashMap<String, Token>,
@@ -258,9 +258,9 @@ struct ServiceRuntimeInner {
     onstart: Vec<Pin<Box<dyn Future<Output = ()>>>>,
 }
 
-impl RuntimeConfiguration {
+impl ServiceRuntime {
     fn new(names: HashMap<String, Token>) -> Self {
-        RuntimeConfiguration(Rc::new(RefCell::new(ServiceRuntimeInner {
+        ServiceRuntime(Rc::new(RefCell::new(ServiceRuntimeInner {
             names,
             services: HashMap::default(),
             onstart: Vec::new(),

ntex/src/server/mod.rs

@@ -22,7 +22,7 @@ pub use ntex_tls::max_concurrent_ssl_accept;
 
 pub(crate) use self::builder::create_tcp_listener;
 pub use self::builder::ServerBuilder;
-pub use self::config::{Configuration, RuntimeConfiguration, ServiceConfig};
+pub use self::config::{Config, ServiceConfig, ServiceRuntime};
 pub use self::test::{build_test_server, test_server, TestServer};
 
 #[non_exhaustive]

ntex/src/server/service.rs

@@ -8,7 +8,7 @@ use crate::service::{Service, ServiceFactory};
 use crate::util::{counter::CounterGuard, Pool, PoolId, Ready};
 use crate::{rt::spawn, time::Millis};
 
-use super::{socket::Stream, ServiceConfig, Token};
+use super::{socket::Stream, Config, Token};
 
 /// Server message
 pub(super) enum ServerMessage {
@@ -23,7 +23,7 @@ pub(super) enum ServerMessage {
 pub(super) trait StreamServiceFactory: Send + Clone + 'static {
     type Factory: ServiceFactory<Config = (), Request = Io>;
 
-    fn create(&self, _: ServiceConfig) -> Self::Factory;
+    fn create(&self, _: Config) -> Self::Factory;
 }
 
 pub(super) trait InternalServiceFactory: Send {
@@ -159,7 +159,7 @@ where
     ) -> Pin<Box<dyn Future<Output = Result<Vec<(Token, BoxedServerService)>, ()>>>>
     {
         let token = self.token;
-        let cfg = ServiceConfig::default();
+        let cfg = Config::default();
         let fut = self.inner.create(cfg.clone()).new_service(());
 
         Box::pin(async move {
@@ -194,13 +194,13 @@ impl InternalServiceFactory for Box<dyn InternalServiceFactory> {
 
 impl<F, T> StreamServiceFactory for F
 where
-    F: Fn(ServiceConfig) -> T + Send + Clone + 'static,
+    F: Fn(Config) -> T + Send + Clone + 'static,
     T: ServiceFactory<Config = (), Request = Io>,
 {
     type Factory = T;
 
     #[inline]
-    fn create(&self, cfg: ServiceConfig) -> T {
+    fn create(&self, cfg: Config) -> T {
         (self)(cfg)
     }
 }