proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-05-31 01:29:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

src/tools/daemon.rs: use new ServerState handler

Browse Source
This commit is contained in:
Dietmar Maurer 2019-04-08 14:00:23 +02:00
parent 9761b81b84
commit b9e9f05aaf
1 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/tools/daemon.rs
View File

@ -6,12 +6,10 @@ use std::os::unix::ffi::OsStrExt;
use std::panic::UnwindSafe; use std::panic::UnwindSafe;
use failure::*; use failure::*;
use futures::future::poll_fn;
use futures::try_ready;
use tokio::prelude::*; use tokio::prelude::*;
use crate::server;
use crate::tools::fd_change_cloexec; use crate::tools::fd_change_cloexec;
use crate::tools::signalfd::{SigSet, SignalFd};
// Unfortunately FnBox is nightly-only and Box<FnOnce> is unusable, so just use Box<Fn>... // Unfortunately FnBox is nightly-only and Box<FnOnce> is unusable, so just use Box<Fn>...
pub type BoxedStoreFunc = Box<dyn Fn() -> Result<String, Error> + UnwindSafe + Send>; pub type BoxedStoreFunc = Box<dyn Fn() -> Result<String, Error> + UnwindSafe + Send>;
@ -169,40 +167,21 @@ where
let service = create_service(listener)?; let service = create_service(listener)?;
// Block SIGHUP for *all* threads and use it for a signalfd handler:
use nix::sys::signal;
let mut sigs = SigSet::empty();
sigs.add(signal::Signal::SIGHUP);
signal::sigprocmask(signal::SigmaskHow::SIG_BLOCK, Some(&sigs), None)?;
let mut sigfdstream = SignalFd::new(&sigs)?
.map_err(|e| log::error!("error in signal handler: {}", e));
let mut reloader = Some(reloader); let mut reloader = Some(reloader);
// Use a Future instead of a Stream for ease-of-use: Poll until we receive a SIGHUP. let abort_future = server::shutdown_future().map_err(|_| {});
let signal_handler = poll_fn(move || { Ok(service
match try_ready!(sigfdstream.poll()) { .select(abort_future)
Some(si) => { .map(move |_| {
log::info!("received signal {}", si.ssi_signo); crate::tools::request_shutdown(); // make sure we are in shutdown mode
if si.ssi_signo == signal::Signal::SIGHUP as u32 { if server::is_reload_request() {
if let Err(e) = reloader.take().unwrap().fork_restart() { log::info!("daemon reload...");
log::error!("error during reload: {}", e); if let Err(e) = reloader.take().unwrap().fork_restart() {
} log::error!("error during reload: {}", e);
Ok(Async::Ready(())) }
} else { } else {
Ok(Async::NotReady) log::info!("daemon shutting down...");
} }
}
// or the stream ended (which it can't, really)
None => Ok(Async::Ready(()))
}
});
Ok(service.select(signal_handler)
.map(|_| {
log::info!("daemon shutting down...");
crate::tools::request_shutdown();
}) })
.map_err(|_| ()) .map_err(|_| ())
) )