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

proxmox-rest-server: improve logging

Browse Source 
And rename server_state_init() into catch_shutdown_and_reload_signals().
This commit is contained in:
Dietmar Maurer
2021-09-29 14:34:25 +02:00
parent a0ffd4a413
commit 38da8ca1bc
6 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
proxmox-rest-server/src/daemon.rs
View File

@ -152,9 +152,9 @@ impl Reloader {
self.do_reexec(new_args)
})
{
Ok(Ok(())) => eprintln!("do_reexec returned!"),
Ok(Err(err)) => eprintln!("do_reexec failed: {}", err),
Err(_) => eprintln!("panic in re-exec"),
Ok(Ok(())) => log::error!("do_reexec returned!"),
Ok(Err(err)) => log::error!("do_reexec failed: {}", err),
Err(_) => log::error!("panic in re-exec"),
}
}
Ok(ForkResult::Parent { child }) => {
@ -307,7 +307,7 @@ where
wait_service_is_not_state(service_name, "reloading").await?;
}
log::info!("daemon shut down...");
log::info!("daemon shut down.");
Ok(())
}
@ -360,6 +360,11 @@ pub enum SystemdNotify {
/// Tells systemd the startup state of the service (see: ``man sd_notify``)
pub fn systemd_notify(state: SystemdNotify) -> Result<(), Error> {
if let SystemdNotify::Ready = &state {
log::info!("service is ready");
}
let message = match state {
SystemdNotify::Ready => CString::new("READY=1"),
SystemdNotify::Reloading => CString::new("RELOADING=1"),
@ -374,5 +379,6 @@ pub fn systemd_notify(state: SystemdNotify) -> Result<(), Error> {
std::io::Error::from_raw_os_error(-rc),
);
}
Ok(())
}