update a chunk of stuff to the hyper release

[proxmox-backup.git] / src / bin / proxmox-backup-api.rs

diff --git a/src/bin/proxmox-backup-api.rs b/src/bin/proxmox-backup-api.rs
index 37d950ae5c7e83cfd4e9f83a012c308a51635dff..9062304a6633fae136eb9c3d1d2a4580efc587cf 100644 (file)
--- a/src/bin/proxmox-backup-api.rs
+++ b/src/bin/proxmox-backup-api.rs
@@ -1,31 +1,27 @@
-extern crate proxmox_backup;
+use failure::*;
+use futures::*;
+
+use proxmox::tools::try_block;
+use proxmox::api::RpcEnvironmentType;
 
 //use proxmox_backup::tools;
-use proxmox_backup::api_schema::router::*;
-use proxmox_backup::api_schema::config::*;
+//use proxmox_backup::api_schema::config::*;
 use proxmox_backup::server::rest::*;
 use proxmox_backup::server;
 use proxmox_backup::tools::daemon;
 use proxmox_backup::auth_helpers::*;
 use proxmox_backup::config;
+use proxmox_backup::buildcfg;
 
-use failure::*;
-use lazy_static::lazy_static;
-
-use futures::*;
-use futures::future::Future;
-
-use hyper;
-
-fn main() {
-
-    if let Err(err) = run() {
+#[tokio::main]
+async fn main() {
+    if let Err(err) = run().await {
         eprintln!("Error: {}", err);
         std::process::exit(-1);
     }
 }
 
-fn run() -> Result<(), Error> {
+async fn run() -> Result<(), Error> {
     if let Err(err) = syslog::init(
         syslog::Facility::LOG_DAEMON,
         log::LevelFilter::Info,
@@ -33,7 +29,7 @@ fn run() -> Result<(), Error> {
         bail!("unable to inititialize syslog - {}", err);
     }
 
-    server::create_task_log_dir()?;
+    server::create_task_log_dirs()?;
 
     config::create_configdir()?;
 
@@ -47,36 +43,46 @@ fn run() -> Result<(), Error> {
     }
     let _ = csrf_secret(); // load with lazy_static
 
-    lazy_static!{
-       static ref ROUTER: Router = proxmox_backup::api2::router();
-    }
-
-    let config = ApiConfig::new(
-        env!("PROXMOX_JSDIR"), &ROUTER, RpcEnvironmentType::PRIVILEGED);
-
+    let config = server::ApiConfig::new(
+        buildcfg::JS_DIR, &proxmox_backup::api2::ROUTER, RpcEnvironmentType::PRIVILEGED);
+ 
     let rest_server = RestServer::new(config);
 
     // http server future:
     let server = daemon::create_daemon(
         ([127,0,0,1], 82).into(),
-        |listener| {
-            Ok(hyper::Server::builder(listener.incoming())
-                .serve(rest_server)
-                .map_err(|e| eprintln!("server error: {}", e))
+        move |listener, ready| {
+            let incoming = proxmox_backup::tools::async_io::StaticIncoming::from(listener);
+            Ok(ready
+                .and_then(|_| hyper::Server::builder(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);
+                    }
+                })
             )
         },
-    )?;
+    );
 
-    tokio::run(lazy(||  {
-
-        if let Err(err) = server::server_state_init() {
-            eprintln!("unable to start daemon - {}", err);
-        } else {
-            tokio::spawn(server);
-        }
+    daemon::systemd_notify(daemon::SystemdNotify::Ready)?;
 
+    let init_result: Result<(), Error> = try_block!({
+        server::create_task_control_socket()?;
+        server::server_state_init()?;
         Ok(())
-    }));
+    });
+
+    if let Err(err) = init_result {
+        bail!("unable to start daemon - {}", err);
+    }
+
+    server.await?;
 
+    log::info!("done - exit server");
+    
     Ok(())
 }