[pbs-devel] [PATCH proxmox-backup 2/3] adapt to the new ApiHandler variants
Dominik Csapak
d.csapak at proxmox.com
Fri Apr 8 11:56:05 CEST 2022
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 <d.csapak at proxmox.com>
---
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<Env: RpcEnvironment, S: 'static + BuildHa
let params = parse_query_parameters(info.parameters, "", &parts, &uri_param)?;
(handler)(parts, req_body, params, info, Box::new(rpcenv)).await
}
+ ApiHandler::StreamingSync(handler) => {
+ 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 47124089..e5d9f508 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
More information about the pbs-devel
mailing list