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 CFBA291BBB for ; Thu, 9 Feb 2023 14:32:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ABE9F24903 for ; Thu, 9 Feb 2023 14:31:35 +0100 (CET) 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 for ; Thu, 9 Feb 2023 14:31:34 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8FE3646549 for ; Thu, 9 Feb 2023 14:31:34 +0100 (CET) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Thu, 9 Feb 2023 14:31:12 +0100 Message-Id: <20230209133128.695211-3-l.wagner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230209133128.695211-1-l.wagner@proxmox.com> References: <20230209133128.695211-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.230 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [api.rs] Subject: [pbs-devel] [PATCH v3 proxmox-backup 02/18] debug cli: use handle_worker in proxmox-rest-server 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, 09 Feb 2023 13:32:05 -0000 The function was moved to proxmox-rest-server to make it usable in the proxmox-backup-manager cli binary. Signed-off-by: Lukas Wagner --- src/bin/proxmox_backup_debug/api.rs | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/src/bin/proxmox_backup_debug/api.rs b/src/bin/proxmox_backup_debug/api.rs index 5980c180..64c22b96 100644 --- a/src/bin/proxmox_backup_debug/api.rs +++ b/src/bin/proxmox_backup_debug/api.rs @@ -1,9 +1,7 @@ use anyhow::{bail, format_err, Error}; -use futures::FutureExt; use hyper::Method; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; -use tokio::signal::unix::{signal, SignalKind}; use std::collections::HashMap; @@ -11,7 +9,7 @@ use proxmox_router::{cli::*, ApiHandler, ApiMethod, RpcEnvironment, SubRoute}; use proxmox_schema::format::DocumentationFormat; use proxmox_schema::{api, ApiType, ParameterSchema, Schema}; -use pbs_api_types::{PROXMOX_UPID_REGEX, UPID}; +use pbs_api_types::PROXMOX_UPID_REGEX; use pbs_client::view_task_result; use proxmox_rest_server::normalize_uri_path; @@ -247,27 +245,6 @@ async fn call_api_code( } } -async fn handle_worker(upid_str: &str) -> Result<(), Error> { - let upid: UPID = upid_str.parse()?; - let mut signal_stream = signal(SignalKind::interrupt())?; - let abort_future = async move { - while signal_stream.recv().await.is_some() { - println!("got shutdown request (SIGINT)"); - proxmox_rest_server::abort_local_worker(upid.clone()); - } - Ok::<_, Error>(()) - }; - - let result_future = proxmox_rest_server::wait_for_local_worker(upid_str); - - futures::select! { - result = result_future.fuse() => result?, - abort = abort_future.fuse() => abort?, - }; - - Ok(()) -} - async fn call_api_and_format_result( method: String, path: String, @@ -285,7 +262,7 @@ async fn call_api_and_format_result( return Ok(()); } - handle_worker(upid).await?; + proxmox_rest_server::handle_worker(upid).await?; if output_format == "text" { return Ok(()); -- 2.30.2