server/worker_task: fix upid_read_status

a range from high to low in rust results in an empty range
(see std::ops::Range documentation)
so we need to generate the range from 0..data.len() and then reverse it

also, the task log contains a newline at the end, so we have to remove
that (should it exist)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-09-07 14:50:01 +02:00 committed by Dietmar Maurer
parent 0623674f44
commit a4c1143664
1 changed files with 6 additions and 1 deletions

View File

@ -210,9 +210,14 @@ pub fn upid_read_status(upid: &UPID) -> Result<TaskState, Error> {
let mut data = Vec::with_capacity(8192); let mut data = Vec::with_capacity(8192);
file.read_to_end(&mut data)?; file.read_to_end(&mut data)?;
// task logs should end with newline, we do not want it here
if data[data.len()-1] == b'\n' {
data.pop();
}
let last_line = { let last_line = {
let mut start = 0; let mut start = 0;
for pos in data.len()-1..=0 { for pos in (0..data.len()).rev() {
if data[pos] == b'\n' { if data[pos] == b'\n' {
start = pos + 1; start = pos + 1;
break; break;