From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 507A56C699 for ; Thu, 23 Sep 2021 12:13:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 47C6E23E36 for ; Thu, 23 Sep 2021 12:13:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C3DFB23E2D for ; Thu, 23 Sep 2021 12:13:33 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9B44E44A84; Thu, 23 Sep 2021 12:13:33 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Thu, 23 Sep 2021 12:13:29 +0200 Message-Id: <20210923101329.950146-6-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210923101329.950146-1-dietmar@proxmox.com> References: <20210923101329.950146-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.582 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 6/6] proxmox-backup-manager: setup worker and command socket X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Sep 2021 10:13:34 -0000 --- src/bin/proxmox-backup-manager.rs | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs index b9e4e2ff..a03e1db8 100644 --- a/src/bin/proxmox-backup-manager.rs +++ b/src/bin/proxmox-backup-manager.rs @@ -5,6 +5,7 @@ use anyhow::{format_err, Error}; use serde_json::{json, Value}; use proxmox::api::{api, cli::*, RpcEnvironment}; +use proxmox::tools::fs::CreateOptions; use pbs_client::{connect_to_localhost, display_task_log, view_task_result}; use pbs_tools::percent_encoding::percent_encode_component; @@ -359,9 +360,7 @@ async fn get_versions(verbose: bool, param: Value) -> Result { Ok(Value::Null) } -fn main() { - - proxmox_backup::tools::setup_safe_path_env(); +async fn run() -> Result<(), Error> { let cmd_def = CliCommandMap::new() .insert("acl", acl_commands()) @@ -401,12 +400,27 @@ fn main() { CliCommand::new(&API_METHOD_GET_VERSIONS) ); + let backup_user = pbs_config::backup_user()?; + let file_opts = CreateOptions::new().owner(backup_user.uid).group(backup_user.gid); + proxmox_rest_server::init_worker_tasks(pbs_buildcfg::PROXMOX_BACKUP_LOG_DIR_M!().into(), file_opts.clone())?; + let mut commando_sock = proxmox_rest_server::CommandoSocket::new(proxmox_rest_server::our_ctrl_sock(), backup_user.gid); + proxmox_rest_server::register_task_control_commands(&mut commando_sock)?; + commando_sock.spawn()?; let mut rpcenv = CliEnvironment::new(); rpcenv.set_auth_id(Some(String::from("root@pam"))); - pbs_runtime::main(run_async_cli_command(cmd_def, rpcenv)); + run_async_cli_command(cmd_def, rpcenv).await; // this call exit(-1) on error + + Ok(()) +} + +fn main() -> Result<(), Error> { + + proxmox_backup::tools::setup_safe_path_env(); + + pbs_runtime::main(run()) } // shell completion helper -- 2.30.2