depend on proxmox 0.1.31 - use Value to store result metadata

This commit is contained in:
Dietmar Maurer
2020-05-18 09:57:35 +02:00
parent 2e686e0a63
commit e8d1da6a15
9 changed files with 42 additions and 51 deletions

View File

@ -66,7 +66,7 @@ fn check_duplicate_gateway_v6(config: &NetworkConfig, iface: &str) -> Result<(),
pub fn list_network_devices(
_param: Value,
_info: &ApiMethod,
rpcenv: &mut dyn RpcEnvironment,
mut rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
let (config, digest) = network::config()?;
@ -84,7 +84,7 @@ pub fn list_network_devices(
let diff = network::changes()?;
if !diff.is_empty() {
rpcenv.set_result_attrib("changes", diff.into());
rpcenv["changes"] = diff.into();
}
Ok(list.into())

View File

@ -131,7 +131,7 @@ fn dump_journal(
fn get_syslog(
param: Value,
_info: &ApiMethod,
rpcenv: &mut dyn RpcEnvironment,
mut rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
let (count, lines) = dump_journal(
@ -141,7 +141,7 @@ fn get_syslog(
param["until"].as_str(),
param["service"].as_str())?;
rpcenv.set_result_attrib("total", Value::from(count));
rpcenv["total"] = Value::from(count);
Ok(json!(lines))
}

View File

@ -156,7 +156,7 @@ fn extract_upid(param: &Value) -> Result<UPID, Error> {
/// Read task log.
async fn read_task_log(
param: Value,
rpcenv: &mut dyn RpcEnvironment,
mut rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
let upid = extract_upid(&param)?;
@ -199,11 +199,11 @@ async fn read_task_log(
}
}
rpcenv.set_result_attrib("total", Value::from(count));
rpcenv["total"] = Value::from(count);
if test_status {
let active = crate::server::worker_is_active(&upid).await?;
rpcenv.set_result_attrib("active", Value::from(active));
rpcenv["active"] = Value::from(active);
}
Ok(json!(lines))
@ -304,7 +304,7 @@ pub fn list_tasks(
errors: bool,
running: bool,
param: Value,
rpcenv: &mut dyn RpcEnvironment,
mut rpcenv: &mut dyn RpcEnvironment,
) -> Result<Vec<TaskListItem>, Error> {
let username = rpcenv.get_user().unwrap();
@ -382,7 +382,7 @@ pub fn list_tasks(
if (result.len() as u64) < limit { result.push(entry); };
}
rpcenv.set_result_attrib("total", Value::from(count));
rpcenv["total"] = Value::from(count);
Ok(result)
}