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 signal handling #183 (#187)

Browse source
This commit is contained in:
Nikolay Kim 2023-03-11 12:41:51 +11:00 • committed by GitHub
parent 1a2bdf33eb
commit 17ed3db11d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-tokio/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.2.3] - 2023-03-11
* Fix signal handling #183
## [0.2.2] - 2023-01-26 ## [0.2.2] - 2023-01-26
* Update io api usage * Update io api usage

2
ntex-tokio/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-tokio" name = "ntex-tokio"
version = "0.2.2" version = "0.2.3"
authors = ["ntex contributors <team@ntex.rs>"] authors = ["ntex contributors <team@ntex.rs>"]
description = "tokio intergration for ntex framework" description = "tokio intergration for ntex framework"
keywords = ["network", "framework", "async", "futures"] keywords = ["network", "framework", "async", "futures"]

32
ntex-tokio/src/signals.rs
View file

@ -42,7 +42,11 @@ struct Signals {
#[cfg(not(unix))] #[cfg(not(unix))]
signal: Pin<Box<dyn Future<Output = std::io::Result<()>>>>, signal: Pin<Box<dyn Future<Output = std::io::Result<()>>>>,
#[cfg(unix)] #[cfg(unix)]
signals: Vec<(Signal, tokio::signal::unix::Signal)>, signals: Vec<(
Signal,
tokio::signal::unix::Signal,
tokio::signal::unix::SignalKind,
)>,
} }
impl Signals { impl Signals {
@ -70,7 +74,7 @@ impl Signals {
let mut signals = Vec::new(); let mut signals = Vec::new();
for (kind, sig) in sig_map.iter() { for (kind, sig) in sig_map.iter() {
match unix::signal(*kind) { match unix::signal(*kind) {
Ok(stream) => signals.push((*sig, stream)), Ok(stream) => signals.push((*sig, stream, *kind)),
Err(e) => log::error!( Err(e) => log::error!(
"Cannot initialize stream handler for {:?} err: {}", "Cannot initialize stream handler for {:?} err: {}",
sig, sig,
@ -106,12 +110,26 @@ impl Future for Signals {
} }
#[cfg(unix)] #[cfg(unix)]
{ {
for (sig, fut) in self.signals.iter_mut() { for (sig, stream, kind) in self.signals.iter_mut() {
if Pin::new(fut).poll_recv(cx).is_ready() { loop {
let handlers = SHANDLERS.with(|h| mem::take(&mut *h.borrow_mut())); if let Poll::Ready(res) = Pin::new(&mut *stream).poll_recv(cx) {
for sender in handlers { let handlers = SHANDLERS.with(|h| mem::take(&mut *h.borrow_mut()));
let _ = sender.send(*sig); for sender in handlers {
let _ = sender.send(*sig);
}
match tokio::signal::unix::signal(*kind) {
Ok(s) => {
*stream = s;
continue;
}
Err(e) => log::error!(
"Cannot initialize stream handler for {:?} err: {}",
sig,
e
),
}
} }
break;
} }
} }
Poll::Pending Poll::Pending

2
ntex/Cargo.toml
View file

@ -60,7 +60,7 @@ ntex-h2 = "0.2.1"
ntex-rt = "0.4.7" ntex-rt = "0.4.7"
ntex-io = "0.2.9" ntex-io = "0.2.9"
ntex-tls = "0.2.4" ntex-tls = "0.2.4"
ntex-tokio = { version = "0.2.1", optional = true } ntex-tokio = { version = "0.2.3", optional = true }
ntex-glommio = { version = "0.2.1", optional = true } ntex-glommio = { version = "0.2.1", optional = true }
ntex-async-std = { version = "0.2.1", optional = true } ntex-async-std = { version = "0.2.1", optional = true }