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

tools: daemon: rename some structs

Browse Source 
Reloadable resources are now 'Reloadable' instead of
'ReexecContinue'.

The struct handling the reload is a 'Reloader', not a
'ReexecStore'.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2019-03-18 13:44:37 +01:00
parent 5e7bc50af1
commit e4311382d9
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/proxmox-backup-api.rs
View File

@ -4,7 +4,7 @@ extern crate proxmox_backup;
use proxmox_backup::api_schema::router::*;
use proxmox_backup::api_schema::config::*;
use proxmox_backup::server::rest::*;
use proxmox_backup::tools::daemon::ReexecStore;
use proxmox_backup::tools::daemon::Reloader;
use proxmox_backup::auth_helpers::*;
use proxmox_backup::config;
@ -28,7 +28,7 @@ fn main() {
fn run() -> Result<(), Error> {
// This manages data for reloads:
let mut reexecer = ReexecStore::new();
let mut reloader = Reloader::new();
if let Err(err) = syslog::init(
syslog::Facility::LOG_DAEMON,
@ -60,7 +60,7 @@ fn run() -> Result<(), Error> {
// http server future:
let listener: tokio::net::TcpListener = reexecer.restore(
let listener: tokio::net::TcpListener = reloader.restore(
"PROXMOX_BACKUP_LISTEN_FD",
|| {
let addr = ([127,0,0,1], 82).into();
@ -76,7 +76,7 @@ fn run() -> Result<(), Error> {
let signal_handler =
proxmox_backup::tools::daemon::default_signalfd_stream(
reexecer,
reloader,
|| {
unsafe { QUIT_MAIN = true; }
Ok(())

8
src/bin/proxmox-backup-proxy.rs
View File

@ -1,6 +1,6 @@
use proxmox_backup::configdir;
use proxmox_backup::tools;
use proxmox_backup::tools::daemon::ReexecStore;
use proxmox_backup::tools::daemon::Reloader;
use proxmox_backup::api_schema::router::*;
use proxmox_backup::api_schema::config::*;
use proxmox_backup::server::rest::*;
@ -64,11 +64,11 @@ fn run() -> Result<(), Error> {
};
// This manages data for reloads:
let mut reexecer = ReexecStore::new();
let mut reloader = Reloader::new();
// http server future:
let listener: tokio::net::TcpListener = reexecer.restore(
let listener: tokio::net::TcpListener = reloader.restore(
"PROXMOX_BACKUP_LISTEN_FD",
|| {
let addr = ([0,0,0,0,0,0,0,0], 8007).into();
@ -108,7 +108,7 @@ fn run() -> Result<(), Error> {
// signalfd future:
let signal_handler =
proxmox_backup::tools::daemon::default_signalfd_stream(
reexecer,
reloader,
|| {
unsafe { QUIT_MAIN = true; }
Ok(())