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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C20D961E20 for ; Tue, 8 Sep 2020 07:09:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B710F11573 for ; Tue, 8 Sep 2020 07:09:16 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EEE1B11565 for ; Tue, 8 Sep 2020 07:09:15 +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 AE76844A85 for ; Tue, 8 Sep 2020 07:09:15 +0200 (CEST) Date: Tue, 8 Sep 2020 07:08:19 +0200 (CEST) From: Dietmar Maurer To: Proxmox Backup Server development discussion , Dominik Csapak Message-ID: <1703437304.912.1599541699909@webmail.proxmox.com> In-Reply-To: <20200907125001.6313-1-d.csapak@proxmox.com> References: <20200907125001.6313-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.3-Rev21 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.089 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: [pbs-devel] applied: [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: Tue, 08 Sep 2020 05:09:16 -0000 wow - that hurts .. > On 09/07/2020 2:50 PM Dominik Csapak wrote: > > > 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 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel