tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

daemon: remove last use of tools::read/write

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-07-01 10:39:13 +02:00
parent 5485b579a1
commit ca3c3ce997
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/daemon.rs
View File

@ -9,10 +9,10 @@ use std::panic::UnwindSafe;
use failure::*; use failure::*;
use tokio::prelude::*; use tokio::prelude::*;
use proxmox::tools::io::{ReadExt, WriteExt};
use crate::server; use crate::server;
use crate::tools::{fd_change_cloexec, self}; use crate::tools::{fd_change_cloexec, self};
use crate::tools::read::*;
use crate::tools::write::*;
// 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 FnMut() -> Result<String, Error> + UnwindSafe + Send>; pub type BoxedStoreFunc = Box<dyn FnMut() -> Result<String, Error> + UnwindSafe + Send>;
@ -106,7 +106,7 @@ impl Reloader {
std::fs::File::from_raw_fd(pout.into_raw_fd()) std::fs::File::from_raw_fd(pout.into_raw_fd())
}; };
let pid = nix::unistd::Pid::this(); let pid = nix::unistd::Pid::this();
if let Err(e) = pout.write_value(&pid.as_raw()) { if let Err(e) = unsafe { pout.write_host_value(pid.as_raw()) } {
log::error!("failed to send new server PID to parent: {}", e); log::error!("failed to send new server PID to parent: {}", e);
unsafe { unsafe {
libc::_exit(-1); libc::_exit(-1);
@ -137,7 +137,7 @@ impl Reloader {
let mut pin = unsafe { let mut pin = unsafe {
std::fs::File::from_raw_fd(pin.into_raw_fd()) std::fs::File::from_raw_fd(pin.into_raw_fd())
}; };
let child = nix::unistd::Pid::from_raw(match pin.read_value() { let child = nix::unistd::Pid::from_raw(match unsafe { pin.read_le_value() } {
Ok(v) => v, Ok(v) => v,
Err(e) => { Err(e) => {
log::error!("failed to receive pid of double-forked child process: {}", e); log::error!("failed to receive pid of double-forked child process: {}", e);