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

update to tokio 0.2.0-alpha.4

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2019-09-02 15:16:21 +02:00
parent 1434f4f8df
commit 083ff3fd5d
8 changed files with 72 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ async fn run() -> Result<(), Error> {
let server = daemon::create_daemon(
([0,0,0,0,0,0,0,0], 8007).into(),
|listener| {
|listener, ready| {
let connections = listener
.incoming()
.map_err(Error::from)
@ -87,14 +87,18 @@ async fn run() -> Result<(), Error> {
)
}
});
Ok(hyper::Server::builder(connections)
.serve(rest_server)
.with_graceful_shutdown(server::shutdown_future())
.map_err(|err| eprintln!("server error: {}", err))
.map(|_| ())
Ok(ready
.and_then(|_| hyper::Server::builder(connections)
.serve(rest_server)
.with_graceful_shutdown(server::shutdown_future())
.map_err(Error::from)
)
.map_err(|err| eprintln!("server error: {}", err))
.map(|_| ())
)
},
)?;
);
daemon::systemd_notify(daemon::SystemdNotify::Ready)?;
@ -108,7 +112,7 @@ async fn run() -> Result<(), Error> {
bail!("unable to start daemon - {}", err);
}
server.await;
server.await?;
log::info!("done - exit server");
Ok(())