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

Fix external configuration handling (#332)

Browse source
This commit is contained in:
Nikolay Kim 2024-04-01 23:18:44 +03:00 • committed by GitHub
parent 7e2e3d1730
commit cfc348764a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-server/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes
## [1.0.5] - 2024-04-02
* Fix external configuration handling
## [1.0.4] - 2024-03-30
* Fix signals support #324

2
ntex-server/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-server"
version = "1.0.4"
version = "1.0.5"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Server for ntex framework"
keywords = ["network", "framework", "async", "futures"]

20
ntex-server/src/net/config.rs
View file

@ -193,15 +193,17 @@ impl FactoryService for ConfiguredService {
let mut services = mem::take(&mut rt.0.borrow_mut().services);
let mut res = Vec::new();
while let Some(Some(svc)) = services.pop() {
for entry in names.values() {
if entry.idx == services.len() {
res.push(NetService {
pool: entry.pool,
tokens: entry.tokens.clone(),
factory: svc,
});
break;
while let Some(svc) = services.pop() {
if let Some(svc) = svc {
for entry in names.values() {
if entry.idx == services.len() {
res.push(NetService {
pool: entry.pool,
tokens: entry.tokens.clone(),
factory: svc,
});
break;
}
}
}
}

5
ntex-server/src/net/service.rs
View file

@ -107,6 +107,7 @@ impl ServiceFactory<ServerMessage> for StreamService {
for info in &self.services {
match info.factory.create(()).await {
Ok(svc) => {
log::debug!("Constructed server service for {:?}", info.tokens);
services.push(svc);
let idx = services.len() - 1;
for (token, tag) in &info.tokens {
@ -123,12 +124,10 @@ impl ServiceFactory<ServerMessage> for StreamService {
}
}
let conns = MAX_CONNS_COUNTER.with(|conns| conns.priv_clone());
Ok(StreamServiceImpl {
tokens,
services,
conns,
conns: MAX_CONNS_COUNTER.with(|conns| conns.priv_clone()),
})
}
}

4
ntex-server/src/wrk.rs
View file

@ -90,9 +90,9 @@ impl<T> Worker<T> {
let _ = spawn(async move {
log::info!("Starting worker {:?}", id);
log::debug!("Creating server instance in {:?} worker", id);
log::debug!("Creating server instance in {:?}", id);
let factory = cfg.create().await;
log::debug!("Server instance has been created in {:?} worker", id);
log::debug!("Server instance has been created in {:?}", id);
match create(id, rx1, rx2, factory, avail_tx).await {
Ok((svc, wrk)) => {