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

src/bin/proxmox-backup-client.r - display_task_log: add new strip_date parameter

This commit is contained in:
Dietmar Maurer 2019-12-08 10:22:02 +01:00
parent 163e9bbe91
commit b73ff941f6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/proxmox-backup-client.rs
View File

@ -1127,8 +1127,8 @@ fn upload_log(
fn display_task_log( fn display_task_log(
client: HttpClient, client: HttpClient,
upid_str: &str, upid_str: &str,
strip_date: bool,
) -> Result<(), Error> { ) -> Result<(), Error> {
println!("TESTLOG {}", upid_str);
let path = format!("api2/json/nodes/localhost/tasks/{}/log", upid_str); let path = format!("api2/json/nodes/localhost/tasks/{}/log", upid_str);
@ -1149,9 +1149,15 @@ fn display_task_log(
let n = item["n"].as_u64().unwrap(); let n = item["n"].as_u64().unwrap();
let t = item["t"].as_str().unwrap(); let t = item["t"].as_str().unwrap();
if n != start { bail!("got wrong line number in response data ({} != {}", n, start); } if n != start { bail!("got wrong line number in response data ({} != {}", n, start); }
start += 1; let b = t.as_bytes();
if strip_date && b.len() > 27 && b[25] == b':' && b[26] == b' '{
let line = &t[27..];
println!("{}", line);
} else {
println!("{}", t); println!("{}", t);
} }
start += 1;
}
if start > total { if start > total {
if active { if active {
@ -1217,8 +1223,7 @@ fn prune(
let data = &result["data"]; let data = &result["data"];
if output_format == "text" { if output_format == "text" {
if let Some(upid) = data.as_str() { if let Some(upid) = data.as_str() {
println!("UPID {:?}", data); display_task_log(client, upid, true)?;
display_task_log(client, upid)?;
} }
} else { } else {
format_and_print_result(&data, &output_format); format_and_print_result(&data, &output_format);