tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle_async_api_request: put rpcenv into a Box

Browse Source 
So that we can pass rpcenv into futures.
This commit is contained in:
Dietmar Maurer
2019-05-09 18:01:24 +02:00
parent 2c41096a4b
commit b4b63e520d
8 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api2/admin/datastore/backup/upload_chunk.rs
View File

@ -71,7 +71,7 @@ fn upload_chunk(
req_body: Body,
param: Value,
_info: &ApiAsyncMethod,
rpcenv: &mut RpcEnvironment,
rpcenv: Box<RpcEnvironment>,
) -> Result<BoxFut, Error> {
let size = tools::required_integer_param(&param, "size")?;
@ -85,7 +85,11 @@ fn upload_chunk(
let resp = upload.select(abort_future)
.and_then(|(result, _)| Ok(result))
.map_err(|(err, _)| err)
.then(|res| Ok(crate::server::formatter::json_response(res)));
//.then(|res| Ok(crate::server::formatter::json_response(res)));
.then(move |res| {
let env: &BackupEnvironment = rpcenv.as_ref();
Ok(env.format_response(res))
});
Ok(Box::new(resp))