From db671bdb7f862c922da8f23e2033c6d11b4b277a Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Tue, 9 Jan 2024 21:56:05 +0600 Subject: [PATCH] Prepare connect release --- ntex-connect/CHANGES.md | 4 ++++ ntex-connect/Cargo.toml | 14 +++++++------- ntex-connect/src/resolve.rs | 23 ++++++++++++++++++----- ntex-connect/src/service.rs | 7 +++++-- ntex-tls/CHANGES.md | 4 ++++ ntex-tls/Cargo.toml | 6 +++--- ntex/Cargo.toml | 4 ++-- 7 files changed, 43 insertions(+), 19 deletions(-) diff --git a/ntex-connect/CHANGES.md b/ntex-connect/CHANGES.md index 82c7098e..5bcfd1c6 100644 --- a/ntex-connect/CHANGES.md +++ b/ntex-connect/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## [1.0.0] - 2024-01-09 + +* Release + ## [1.0.0-b.1] - 2024-01-08 * Refactor io tls filters diff --git a/ntex-connect/Cargo.toml b/ntex-connect/Cargo.toml index 63528bd2..122501ee 100644 --- a/ntex-connect/Cargo.toml +++ b/ntex-connect/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-connect" -version = "1.0.0-b.1" +version = "1.0.0" authors = ["ntex contributors "] description = "ntexwork connect utils for ntex framework" keywords = ["network", "framework", "async", "futures"] @@ -35,8 +35,8 @@ async-std = ["ntex-rt/async-std", "ntex-async-std"] [dependencies] ntex-service = "2.0.0" -ntex-io = "1.0.0-b.1" -ntex-tls = "1.0.0-b.1" +ntex-io = "1.0.0" +ntex-tls = "1.0.0" ntex-util = "1.0.0" ntex-bytes = "0.1.21" ntex-http = "0.1" @@ -45,9 +45,9 @@ ntex-rt = "0.4.7" log = "0.4" thiserror = "1.0" -ntex-tokio = { version = "0.4.0-b.0", optional = true } -ntex-glommio = { version = "0.4.0-b.0", optional = true } -ntex-async-std = { version = "0.4.0-b.0", optional = true } +ntex-tokio = { version = "0.4.0", optional = true } +ntex-glommio = { version = "0.4.0", optional = true } +ntex-async-std = { version = "0.4.0", optional = true } # openssl tls-openssl = { version="0.10", package = "openssl", optional = true } @@ -59,4 +59,4 @@ webpki-roots = { version = "0.25", optional = true } [dev-dependencies] rand = "0.8" env_logger = "0.10" -ntex = { version = "1.0.0-b.0", features = ["tokio"] } +ntex = { version = "1.0.0-b.1", features = ["tokio"] } diff --git a/ntex-connect/src/resolve.rs b/ntex-connect/src/resolve.rs index 6bdde90e..02afa309 100644 --- a/ntex-connect/src/resolve.rs +++ b/ntex-connect/src/resolve.rs @@ -19,14 +19,24 @@ impl Resolver { impl Resolver { /// Lookup ip addresses for provided host - pub async fn lookup(&self, mut req: Connect) -> Result, ConnectError> { + pub async fn lookup(&self, req: Connect) -> Result, ConnectError> { + self.lookup_with_tag(req, "TCP-CLIENT").await + } + + #[doc(hidden)] + /// Lookup ip addresses for provided host + pub async fn lookup_with_tag( + &self, + mut req: Connect, + tag: &'static str, + ) -> Result, ConnectError> { if req.addr.is_some() || req.req.addr().is_some() { Ok(req) } else if let Ok(ip) = req.host().parse() { req.addr = Some(Either::Left(net::SocketAddr::new(ip, req.port()))); Ok(req) } else { - log::trace!("DNS resolver: resolving host {:?}", req.host()); + log::trace!("{}: DNS Resolver - resolving host {:?}", tag, req.host()); let host = if req.host().contains(':') { req.host().to_string() @@ -44,7 +54,8 @@ impl Resolver { })); log::trace!( - "DNS resolver: host {:?} resolved to {:?}", + "{}: DNS Resolver - host {:?} resolved to {:?}", + tag, req.host(), req.addrs() ); @@ -57,7 +68,8 @@ impl Resolver { } Ok(Err(e)) => { log::trace!( - "DNS resolver: failed to resolve host {:?} err: {}", + "{}: DNS Resolver - failed to resolve host {:?} err: {}", + tag, req.host(), e ); @@ -65,7 +77,8 @@ impl Resolver { } Err(e) => { log::trace!( - "DNS resolver: failed to resolve host {:?} err: {}", + "{}: DNS Resolver - failed to resolve host {:?} err: {}", + tag, req.host(), e ); diff --git a/ntex-connect/src/service.rs b/ntex-connect/src/service.rs index e3899f78..7295c73f 100644 --- a/ntex-connect/src/service.rs +++ b/ntex-connect/src/service.rs @@ -50,7 +50,10 @@ impl Connector { Connect: From, { // resolve first - let address = self.resolver.lookup(message.into()).await?; + let address = self + .resolver + .lookup_with_tag(message.into(), self.tag) + .await?; let port = address.port(); let Connect { req, addr, .. } = address; @@ -92,7 +95,7 @@ impl Clone for Connector { impl fmt::Debug for Connector { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("Connector") - .field("tagr", &self.tag) + .field("tag", &self.tag) .field("resolver", &self.resolver) .field("memory_pool", &self.pool) .finish() diff --git a/ntex-tls/CHANGES.md b/ntex-tls/CHANGES.md index 5582229b..21535618 100644 --- a/ntex-tls/CHANGES.md +++ b/ntex-tls/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## [1.0.0] - 2024-01-09 + +* Release + ## [1.0.0-b.1] - 2024-01-08 * Refactor io tls filters diff --git a/ntex-tls/Cargo.toml b/ntex-tls/Cargo.toml index f2e86a56..cc77629d 100644 --- a/ntex-tls/Cargo.toml +++ b/ntex-tls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-tls" -version = "1.0.0-b.1" +version = "1.0.0" authors = ["ntex contributors "] description = "An implementation of SSL streams for ntex backed by OpenSSL" keywords = ["network", "framework", "async", "futures"] @@ -26,7 +26,7 @@ rustls = ["tls_rust"] [dependencies] ntex-bytes = "0.1.21" -ntex-io = "1.0.0-b.1" +ntex-io = "1.0.0" ntex-util = "1.0.0" ntex-service = "2.0.0" log = "0.4" @@ -39,7 +39,7 @@ tls_openssl = { version = "0.10", package = "openssl", optional = true } tls_rust = { version = "0.21", package = "rustls", optional = true } [dev-dependencies] -ntex = { version = "1.0.0-b.0", features = ["openssl", "rustls", "tokio"] } +ntex = { version = "1.0.0-b.1", features = ["openssl", "rustls", "tokio"] } env_logger = "0.10" rustls-pemfile = "1.0" webpki-roots = "0.25" diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml index b01d31af..763b6056 100644 --- a/ntex/Cargo.toml +++ b/ntex/Cargo.toml @@ -49,7 +49,7 @@ async-std = ["ntex-rt/async-std", "ntex-async-std", "ntex-connect/async-std"] [dependencies] ntex-codec = "0.6.2" -ntex-connect = "1.0.0-b.1" +ntex-connect = "1.0.0" ntex-http = "0.1.11" ntex-router = "0.5.2" ntex-service = "2.0.0" @@ -59,7 +59,7 @@ ntex-bytes = "0.1.21" ntex-h2 = "0.5.0-b.0" ntex-rt = "0.4.11" ntex-io = "1.0.0" -ntex-tls = "1.0.0-b.1" +ntex-tls = "1.0.0" ntex-tokio = { version = "0.4.0", optional = true } ntex-glommio = { version = "0.4.0", optional = true } ntex-async-std = { version = "0.4.0", optional = true }