From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CB41761A2C for ; Mon, 7 Sep 2020 14:50:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BF038B0B6 for ; Mon, 7 Sep 2020 14:50:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 47B7BB0AE for ; Mon, 7 Sep 2020 14:50:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 10FC043376 for ; Mon, 7 Sep 2020 14:50:02 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 7 Sep 2020 14:50:01 +0200 Message-Id: <20200907125001.6313-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.307 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record SUBJ_OBFU_PUNCT_FEW 0.001 Possible punctuation-obfuscated Subject: header SUBJ_OBFU_PUNCT_MANY 0.365 Punctuation-obfuscated Subject: header Subject: [pbs-devel] [PATCH proxmox-backup] server/worker_task: fix upid_read_status X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2020 12:50:02 -0000 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 --- maybe it would be nicer (but slower) to use the .lines() iterator? to not run into such things? src/server/worker_task.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs index 997c2492..28e62ba2 100644 --- a/src/server/worker_task.rs +++ b/src/server/worker_task.rs @@ -210,9 +210,14 @@ pub fn upid_read_status(upid: &UPID) -> Result { let mut data = Vec::with_capacity(8192); 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 mut start = 0; - for pos in data.len()-1..=0 { + for pos in (0..data.len()).rev() { if data[pos] == b'\n' { start = pos + 1; break; -- 2.20.1