bump proxmox crate to 0.1.7

[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 7a1cb543af5a06b43a4fe1c49f8763b3c363270b..4dca9bcb5e43242a5b2d715e4f82f75075c3ca69 100644 (file)
--- a/src/bin/proxmox-backup-api.rs
+++ b/src/bin/proxmox-backup-api.rs
@@ -1,95 +1,91 @@
-extern crate proxmox_backup;
+use failure::*;
+use futures::*;
 
-use std::sync::Arc;
+use proxmox::try_block;
+use proxmox::api::RpcEnvironmentType;
 
-use proxmox_backup::api::schema::*;
-use proxmox_backup::api::router::*;
-use proxmox_backup::api::config::*;
+//use proxmox_backup::tools;
+//use proxmox_backup::api_schema::config::*;
 use proxmox_backup::server::rest::*;
-use proxmox_backup::getopts;
+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;
+fn main() {
+    if let Err(err) = proxmox_backup::tools::runtime::main(run()) {
+        eprintln!("Error: {}", err);
+        std::process::exit(-1);
+    }
+}
 
-use futures::future::Future;
+async fn run() -> Result<(), Error> {
+    if let Err(err) = syslog::init(
+        syslog::Facility::LOG_DAEMON,
+        log::LevelFilter::Info,
+        Some("proxmox-backup-api")) {
+        bail!("unable to inititialize syslog - {}", err);
+    }
 
-use hyper;
+    server::create_task_log_dirs()?;
 
-fn main() {
+    config::create_configdir()?;
 
-    let command : Arc<Schema> = StringSchema::new("Command.")
-        .format(Arc::new(ApiStringFormat::Enum(vec![
-            "start".into(),
-            "status".into(),
-            "stop".into()
-        ])))
-        .into();
-
-    let schema = ObjectSchema::new("Parameters.")
-        .required("command", command);
-
-    let args: Vec<String> = std::env::args().skip(1).collect();
-
-    let options = match getopts::parse_arguments(&args, &vec!["command"], &schema) {
-        Ok((options, rest)) => {
-            if !rest.is_empty() {
-                eprintln!("Error: got additional arguments: {:?}", rest);
-                std::process::exit(-1);
-            }
-            options
-        }
-        Err(err) => {
-            eprintln!("Error: unable to parse arguments:\n{}", err);
-            std::process::exit(-1);
-        }
-    };
-
-    let command = options["command"].as_str().unwrap();
-
-    match command {
-        "start" => {
-            println!("Starting server.");
-        },
-        "stop" => {
-            println!("Stopping server.");
-            std::process::exit(0);
-        },
-        "status" => {
-            println!("Server status.");
-             std::process::exit(0);
-       },
-        _ => {
-            eprintln!("got unexpected command {}", command);
-            std::process::exit(-1);
-        },
-    }
+    config::update_self_signed_cert(false)?;
 
-    let addr = ([0,0,0,0,0,0,0,0], 8007).into();
+    if let Err(err) = generate_auth_key() {
+        bail!("unable to generate auth key - {}", err);
+    }
+    let _ = private_auth_key(); // load with lazy_static
 
-    lazy_static!{
-       static ref ROUTER: Router = proxmox_backup::api2::router();
+    if let Err(err) = generate_csrf_key() {
+        bail!("unable to generate csrf key - {}", err);
     }
+    let _ = csrf_secret(); // load with lazy_static
 
-    let mut config = ApiConfig::new("/usr/share/javascript/proxmox-backup", &ROUTER);
+    let config = server::ApiConfig::new(
+        buildcfg::JS_DIR, &proxmox_backup::api2::ROUTER, RpcEnvironmentType::PRIVILEGED);
+ 
+    let rest_server = RestServer::new(config);
 
-    // add default dirs which includes jquery and bootstrap
-    // my $base = '/usr/share/libpve-http-server-perl';
-    // add_dirs($self->{dirs}, '/css/' => "$base/css/");
-    // add_dirs($self->{dirs}, '/js/' => "$base/js/");
-    // add_dirs($self->{dirs}, '/fonts/' => "$base/fonts/");
-    config.add_alias("novnc", "/usr/share/novnc-pve");
-    config.add_alias("extjs", "/usr/share/javascript/extjs");
-    config.add_alias("fontawesome", "/usr/share/fonts-font-awesome");
-    config.add_alias("xtermjs", "/usr/share/pve-xtermjs");
-    config.add_alias("widgettoolkit", "/usr/share/javascript/proxmox-widget-toolkit");
+    // http server future:
+    let server = daemon::create_daemon(
+        ([127,0,0,1], 82).into(),
+        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);
+                    }
+                })
+            )
+        },
+    );
 
-    let rest_server = RestServer::new(config);
+    daemon::systemd_notify(daemon::SystemdNotify::Ready)?;
+
+    let init_result: Result<(), Error> = try_block!({
+        server::create_task_control_socket()?;
+        server::server_state_init()?;
+        Ok(())
+    });
 
-    let server = hyper::Server::bind(&addr)
-        .serve(rest_server)
-        .map_err(|e| eprintln!("server error: {}", e));
+    if let Err(err) = init_result {
+        bail!("unable to start daemon - {}", err);
+    }
 
+    server.await?;
+    log::info!("server shutting down, waiting for active workers to complete");
+    proxmox_backup::server::last_worker_future().await?;
 
-    // Run this server for... forever!
-    hyper::rt::run(server);
+    log::info!("done - exit server");
+    
+    Ok(())
 }