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 CC55660B38 for ; Thu, 17 Feb 2022 10:40:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6BEFF1D624 for ; Thu, 17 Feb 2022 10:40:46 +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 id 5571A1D588 for ; Thu, 17 Feb 2022 10:40:43 +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 2E95141B06 for ; Thu, 17 Feb 2022 10:40:43 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 17 Feb 2022 10:40:40 +0100 Message-Id: <20220217094041.1632033-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220217094041.1632033-1-d.csapak@proxmox.com> References: <20220217094041.1632033-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.158 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rest.rs, api.rs] Subject: [pbs-devel] [RFC PATCH proxmox-backup 2/3] adapt to the new ApiHandler variants 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, 17 Feb 2022 09:40:46 -0000 namely 'StreamingSync' and 'StreamingAsync' in rest-server by using the new formatter function, and in the debug binary by using 'to_value' Signed-off-by: Dominik Csapak --- proxmox-rest-server/src/rest.rs | 10 ++++++++++ src/bin/proxmox_backup_debug/api.rs | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/proxmox-rest-server/src/rest.rs b/proxmox-rest-server/src/rest.rs index 093e6226..a89c8f1f 100644 --- a/proxmox-rest-server/src/rest.rs +++ b/proxmox-rest-server/src/rest.rs @@ -441,6 +441,16 @@ pub(crate) async fn handle_api_request { + let params = + get_request_parameters(info.parameters, parts, req_body, uri_param).await?; + (handler)(params, info, &mut rpcenv).and_then(|data| formatter.format_data_streaming(data, &rpcenv)) + } + ApiHandler::StreamingAsync(handler) => { + let params = + get_request_parameters(info.parameters, parts, req_body, uri_param).await?; + (handler)(params, info, &mut rpcenv).await.and_then(|data| formatter.format_data_streaming(data, &rpcenv)) + } ApiHandler::Sync(handler) => { let params = get_request_parameters(info.parameters, parts, req_body, uri_param).await?; diff --git a/src/bin/proxmox_backup_debug/api.rs b/src/bin/proxmox_backup_debug/api.rs index dd8c0e6b..2d3bd10c 100644 --- a/src/bin/proxmox_backup_debug/api.rs +++ b/src/bin/proxmox_backup_debug/api.rs @@ -219,6 +219,14 @@ async fn call_api_code( nix::unistd::setuid(backup_user.uid)?; } match method.handler { + ApiHandler::StreamingSync(handler) => { + let res = (handler)(params, method, rpcenv)?.to_value()?; + Ok(res) + } + ApiHandler::StreamingAsync(handler) => { + let res = (handler)(params, method, rpcenv).await?.to_value()?; + Ok(res) + } ApiHandler::AsyncHttp(_handler) => { bail!("not implemented"); } -- 2.30.2