actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-02-07 17:04:23 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:actix/actix-net

Browse Source
This commit is contained in:
Nikolay Kim 2019-12-03 14:09:35 +06:00
commit ec8dca8d69
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actix-rt/src/lib.rs
View File

@ -53,6 +53,7 @@ pub mod net {
pub use tokio::net::{UnixDatagram, UnixListener, UnixStream}; pub use tokio::net::{UnixDatagram, UnixListener, UnixStream};
} }
#[cfg(unix)]
pub use self::unix::*; pub use self::unix::*;
} }

5
actix-server/src/signals.rs
View File

@ -11,12 +11,15 @@ use crate::server::Server;
#[derive(PartialEq, Clone, Copy, Debug)] #[derive(PartialEq, Clone, Copy, Debug)]
pub(crate) enum Signal { pub(crate) enum Signal {
/// SIGHUP /// SIGHUP
#[cfg_attr(not(unix), allow(dead_code))]
Hup, Hup,
/// SIGINT /// SIGINT
Int, Int,
/// SIGTERM /// SIGTERM
#[cfg_attr(not(unix), allow(dead_code))]
Term, Term,
/// SIGQUIT /// SIGQUIT
#[cfg_attr(not(unix), allow(dead_code))]
Quit, Quit,
} }
@ -69,7 +72,7 @@ impl Future for Signals {
#[cfg(not(unix))] #[cfg(not(unix))]
loop { loop {
match Pin::new(&mut self.stream).poll_next(cx) { match Pin::new(&mut self.stream).poll_next(cx) {
Poll::Ready(Ok(Some(_))) => self.srv.signal(Signal::Int), Poll::Ready(Some(_)) => self.srv.signal(Signal::Int),
Poll::Ready(None) => return Poll::Ready(()), Poll::Ready(None) => return Poll::Ready(()),
Poll::Pending => return Poll::Pending, Poll::Pending => return Poll::Pending,
} }