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

src/api2/node/tasks.rs: fix task status api

Browse Source
This commit is contained in:
Dietmar Maurer
2019-04-09 15:12:20 +02:00
parent 0bfd87bc5e
commit c360bd73d3
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,14 +18,23 @@ fn get_task_status(
let upid = extract_upid(&param)?;
let result = if crate::server::worker_is_active(&upid) {
json!({
"status": "running",
})
let mut result = json!({
"upid": param["upid"],
"node": upid.node,
"pid": upid.pid,
"pstart": upid.pstart,
"starttime": upid.starttime,
"type": upid.worker_type,
"id": upid.worker_id,
"user": upid.username,
});
if crate::server::worker_is_active(&upid) {
result["status"] = Value::from("running");
} else {
json!({
"status": "stopped",
})
let exitstatus = crate::server::upid_read_status(&upid).unwrap_or(String::from("unknown"));
result["status"] = Value::from("stopped");
result["exitstatus"] = Value::from(exitstatus);
};
Ok(result)