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 C91E5CC60 for ; Tue, 12 Apr 2022 16:15:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C2BDF18D19 for ; Tue, 12 Apr 2022 16:15:13 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CF45218CF2 for ; Tue, 12 Apr 2022 16:15:11 +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 9AF23414B1 for ; Tue, 12 Apr 2022 16:15:11 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 12 Apr 2022 16:15:09 +0200 Message-Id: <20220412141510.1479080-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220412141510.1479080-1-d.csapak@proxmox.com> References: <20220412141510.1479080-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.137 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] [PATCH proxmox-backup v2 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: Tue, 12 Apr 2022 14:15:13 -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 | 13 +++++++++++++ src/bin/proxmox_backup_debug/api.rs | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/proxmox-rest-server/src/rest.rs b/proxmox-rest-server/src/rest.rs index 2aadf1ed..1689ef6e 100644 --- a/proxmox-rest-server/src/rest.rs +++ b/proxmox-rest-server/src/rest.rs @@ -445,6 +445,19 @@ 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 599425e8..75c8818a 100644 --- a/src/bin/proxmox_backup_debug/api.rs +++ b/src/bin/proxmox_backup_debug/api.rs @@ -229,6 +229,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