change tape drive lock path

[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 d09955a448b932a98fa3f447326f6bdc1cf94fcc..a8fbbadb9b6f7fe6ccff568496692c2a97b167e4 100644 (file)
--- a/src/bin/proxmox-backup-api.rs
+++ b/src/bin/proxmox-backup-api.rs
@@ -1,21 +1,24 @@
-use failure::*;
+use anyhow::{bail, Error};
 use futures::*;
-use lazy_static::lazy_static;
 
-use proxmox::tools::try_block;
+use proxmox::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::server::rest::*;
-use proxmox_backup::server;
+//use proxmox_backup::api_schema::config::*;
+use proxmox_backup::server::{
+    self,
+    auth::default_api_auth,
+    rest::*,
+};
 use proxmox_backup::tools::daemon;
 use proxmox_backup::auth_helpers::*;
 use proxmox_backup::config;
 
-#[tokio::main]
-async fn main() {
-    if let Err(err) = run().await {
+fn main() {
+    proxmox_backup::tools::setup_safe_path_env();
+
+    if let Err(err) = pbs_runtime::main(run()) {
         eprintln!("Error: {}", err);
         std::process::exit(-1);
     }
@@ -33,6 +36,17 @@ async fn run() -> Result<(), Error> {
 
     config::create_configdir()?;
 
+    config::update_self_signed_cert(false)?;
+
+    proxmox_backup::tools::create_run_dir()?;
+
+    proxmox_backup::rrd::create_rrdb_dir()?;
+    proxmox_backup::server::jobstate::create_jobstate_dir()?;
+    proxmox_backup::tape::create_tape_status_dir()?;
+    proxmox_backup::tape::create_drive_state_dir()?;
+    proxmox_backup::tape::create_changer_state_dir()?;
+    proxmox_backup::tape::create_drive_lock_dir()?;
+
     if let Err(err) = generate_auth_key() {
         bail!("unable to generate auth key - {}", err);
     }
@@ -43,35 +57,46 @@ async fn run() -> Result<(), Error> {
     }
     let _ = csrf_secret(); // load with lazy_static
 
-    lazy_static!{
-       static ref ROUTER: Router = proxmox_backup::api2::router();
-    }
+    let mut config = server::ApiConfig::new(
+        pbs_buildcfg::JS_DIR,
+        &proxmox_backup::api2::ROUTER,
+        RpcEnvironmentType::PRIVILEGED,
+        default_api_auth(),
+    )?;
 
-    let config = ApiConfig::new(
-        env!("PROXMOX_JSDIR"), &ROUTER, RpcEnvironmentType::PRIVILEGED);
+    let mut commando_sock = server::CommandoSocket::new(server::our_ctrl_sock());
+
+    config.enable_file_log(pbs_buildcfg::API_ACCESS_LOG_FN, &mut commando_sock)?;
 
     let rest_server = RestServer::new(config);
 
     // 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| {
+            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);
+                    }
+                })
             )
         },
-    )?;
+        "proxmox-backup.service",
+    );
 
+    server::write_pid(pbs_buildcfg::PROXMOX_BACKUP_API_PID_FN)?;
     daemon::systemd_notify(daemon::SystemdNotify::Ready)?;
 
     let init_result: Result<(), Error> = try_block!({
-        server::create_task_control_socket()?;
+        server::register_task_control_commands(&mut commando_sock)?;
+        commando_sock.spawn()?;
         server::server_state_init()?;
         Ok(())
     });
@@ -80,7 +105,9 @@ async fn run() -> Result<(), Error> {
         bail!("unable to start daemon - {}", err);
     }
 
-    server.await;
+    server.await?;
+    log::info!("server shutting down, waiting for active workers to complete");
+    proxmox_backup::server::last_worker_future().await?;
 
     log::info!("done - exit server");