update to tokio 0.2.0-alpha.4

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

src/bin/h2client.rs

@@ -74,7 +74,7 @@ async fn main() -> Result<(), Error> {
 
     let start = std::time::SystemTime::now();
 
-    let conn = TcpStream::connect(&"127.0.0.1:8008".parse().unwrap())
+    let conn = TcpStream::connect(std::net::SocketAddr::from(([127,0,0,1], 8008)))
         .await?;
 
     let (client, h2) = h2::client::Builder::new()

src/bin/h2s-client.rs

@@ -71,7 +71,8 @@ fn send_request(
 async fn main() -> Result<(), Error> {
     let start = std::time::SystemTime::now();
 
-    let conn = tokio::net::TcpStream::connect(&"127.0.0.1:8008".parse().unwrap()).await?;
+    let conn =
+        tokio::net::TcpStream::connect(std::net::SocketAddr::from(([127,0,0,1], 8008))).await?;
 
     conn.set_nodelay(true).unwrap();
     conn.set_recv_buffer_size(1024*1024).unwrap();

src/bin/h2s-server.rs

@@ -24,7 +24,7 @@ async fn main() -> Result<(), Error> {
 
     let acceptor = Arc::new(acceptor.build());
 
-    let listener = TcpListener::bind(&"127.0.0.1:8008".parse().unwrap()).unwrap();
+    let listener = TcpListener::bind(std::net::SocketAddr::from(([127,0,0,1], 8008))).await?;
 
     println!("listening on {:?}", listener.local_addr());
 

src/bin/h2server.rs

@@ -10,7 +10,7 @@ use proxmox_backup::client::pipe_to_stream::PipeToSendStream;
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {
-    let listener = TcpListener::bind(&"127.0.0.1:8008".parse().unwrap()).unwrap();
+    let listener = TcpListener::bind(std::net::SocketAddr::from(([127,0,0,1], 8008))).await?;
 
     println!("listening on {:?}", listener.local_addr());
 

src/bin/proxmox-backup-api.rs

@@ -55,18 +55,21 @@ async fn run() -> Result<(), Error> {
     // http server future:
     let server = daemon::create_daemon(
         ([127,0,0,1], 82).into(),
-        move |listener| {
-            Ok(hyper::Server::builder(listener.incoming())
-               .serve(rest_server)
-               .with_graceful_shutdown(server::shutdown_future())
-               .map(|e| {
-                   if let Err(e) = e {
-                       eprintln!("server error: {}", e);
-                   }
-               })
+        move |listener, ready| {
+            Ok(ready
+                .and_then(|_| hyper::Server::builder(listener.incoming())
+                    .serve(rest_server)
+                    .with_graceful_shutdown(server::shutdown_future())
+                    .map_err(Error::from)
+                )
+                .map(|e| {
+                    if let Err(e) = e {
+                        eprintln!("server error: {}", e);
+                    }
+                })
             )
         },
-    )?;
+    );
 
     daemon::systemd_notify(daemon::SystemdNotify::Ready)?;
 
@@ -80,7 +83,7 @@ async fn run() -> Result<(), Error> {
         bail!("unable to start daemon - {}", err);
     }
 
-    server.await;
+    server.await?;
 
     log::info!("done - exit server");
 

src/bin/proxmox-backup-proxy.rs

@@ -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(())