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

src/server/formatter.rs: impl. new result attribute "active"

This commit is contained in:
Dietmar Maurer 2019-12-07 15:29:42 +01:00
parent 102d8d4136
commit 6b508dd563
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api2/node/tasks.rs
View File

@ -63,8 +63,12 @@ fn read_task_log(
) -> Result<Value, Error> { ) -> Result<Value, Error> {
let upid = extract_upid(&param)?; let upid = extract_upid(&param)?;
let test_status = param["test-status"].as_bool().unwrap_or(false);
let start = param["start"].as_u64().unwrap_or(0); let start = param["start"].as_u64().unwrap_or(0);
let mut limit = param["limit"].as_u64().unwrap_or(50); let mut limit = param["limit"].as_u64().unwrap_or(50);
let mut count: u64 = 0; let mut count: u64 = 0;
let path = upid.log_path(); let path = upid.log_path();
@ -93,6 +97,11 @@ fn read_task_log(
rpcenv.set_result_attrib("total", Value::from(count)); rpcenv.set_result_attrib("total", Value::from(count));
if test_status {
let active = crate::server::worker_is_active(&upid);
rpcenv.set_result_attrib("active", Value::from(active));
}
Ok(json!(lines)) Ok(json!(lines))
} }
@ -184,6 +193,12 @@ const UPID_API_SUBDIRS: SubdirMap = &[
"Read task log.", "Read task log.",
&sorted!([ &sorted!([
("node", false, &NODE_SCHEMA), ("node", false, &NODE_SCHEMA),
( "test-status",
true,
&BooleanSchema::new(
"Test task status, and set result attribute \"active\" accordingly."
).schema()
),
("upid", false, &UPID_SCHEMA), ("upid", false, &UPID_SCHEMA),
("start", true, &IntegerSchema::new("Start at this line.") ("start", true, &IntegerSchema::new("Start at this line.")
.minimum(0) .minimum(0)

32
src/server/formatter.rs
View File

@ -39,19 +39,28 @@ pub fn json_data_response(data: Value) -> Response<Body> {
response response
} }
fn add_result_attributes(result: &mut Value, rpcenv: &dyn RpcEnvironment)
{
if let Some(total) = rpcenv.get_result_attrib("total").and_then(|v| v.as_u64()) {
result["total"] = Value::from(total);
}
if let Some(active) = rpcenv.get_result_attrib("active").and_then(|v| v.as_bool()) {
result["active"] = Value::from(active);
}
if let Some(changes) = rpcenv.get_result_attrib("changes") {
result["changes"] = changes.clone();
}
}
fn json_format_data(data: Value, rpcenv: &dyn RpcEnvironment) -> Response<Body> { fn json_format_data(data: Value, rpcenv: &dyn RpcEnvironment) -> Response<Body> {
let mut result = json!({ let mut result = json!({
"data": data "data": data
}); });
if let Some(total) = rpcenv.get_result_attrib("total").and_then(|v| v.as_u64()) { add_result_attributes(&mut result, rpcenv);
result["total"] = Value::from(total);
}
if let Some(changes) = rpcenv.get_result_attrib("changes") {
result["changes"] = changes.clone();
}
json_data_response(result) json_data_response(result)
} }
@ -89,14 +98,7 @@ fn extjs_format_data(data: Value, rpcenv: &dyn RpcEnvironment) -> Response<Body>
"success": true "success": true
}); });
if let Some(total) = rpcenv.get_result_attrib("total").and_then(|v| v.as_u64()) { add_result_attributes(&mut result, rpcenv);
result["total"] = Value::from(total);
}
if let Some(changes) = rpcenv.get_result_attrib("changes") {
result["changes"] = changes.clone();
}
json_data_response(result) json_data_response(result)
} }