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

daemon: simlify code (make it easier to use)

Browse Source
This commit is contained in:
Dietmar Maurer
2021-09-29 11:21:32 +02:00
parent 01a080215d
commit d265420025
4 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,21 +106,18 @@ async fn run() -> Result<(), Error> {
// http server future:
let server = daemon::create_daemon(
([127,0,0,1], 82).into(),
move |listener, ready| {
move |listener| {
let incoming = hyper::server::conn::AddrIncoming::from_listener(listener)?;
Ok(ready
.and_then(|_| hyper::Server::builder(incoming)
Ok(async {
daemon::systemd_notify(daemon::SystemdNotify::Ready)?;
hyper::Server::builder(incoming)
.serve(rest_server)
.with_graceful_shutdown(proxmox_rest_server::shutdown_future())
.map_err(Error::from)
)
.map(|e| {
if let Err(e) = e {
eprintln!("server error: {}", e);
}
})
)
.await
})
},
"proxmox-backup.service",
);

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

@ -247,20 +247,20 @@ async fn run() -> Result<(), Error> {
let server = daemon::create_daemon(
([0,0,0,0,0,0,0,0], 8007).into(),
move |listener, ready| {
move |listener| {
let connections = accept_connections(listener, acceptor, debug);
let connections = hyper::server::accept::from_stream(ReceiverStream::new(connections));
Ok(ready
.and_then(|_| hyper::Server::builder(connections)
Ok(async {
daemon::systemd_notify(daemon::SystemdNotify::Ready)?;
hyper::Server::builder(connections)
.serve(rest_server)
.with_graceful_shutdown(proxmox_rest_server::shutdown_future())
.map_err(Error::from)
)
.map_err(|err| eprintln!("server error: {}", err))
.map(|_| ())
)
.await
})
},
"proxmox-backup-proxy.service",
);