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 4001074BEE for ; Mon, 11 Oct 2021 15:12:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 24AFA21012 for ; Mon, 11 Oct 2021 15:12:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 0F75221001 for ; Mon, 11 Oct 2021 15:12:19 +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 C4EAC45CF2 for ; Mon, 11 Oct 2021 15:12:18 +0200 (CEST) Message-ID: <9594ead4-8077-c604-b1fc-541be829bd67@proxmox.com> Date: Mon, 11 Oct 2021 15:12:18 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:94.0) Gecko/20100101 Thunderbird/94.0 Content-Language: en-US To: Proxmox Backup Server development discussion , Dominik Csapak References: <20211011121432.1006944-1-d.csapak@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20211011121432.1006944-1-d.csapak@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.207 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-backup v2 1/2] rest-server/worker-task: replace newlines with '\n' in task result 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, 11 Oct 2021 13:12:50 -0000 On 11.10.21 14:14, Dominik Csapak wrote: > we parse the task result from the last line, so we should not print a > new line in the task result, else we get an 'unknown' task state > isn't the issue that we already print the newline in the file_logger's log method this is using underneath and we could get two newlines (i.e. a last empty line) which then failed to parse? > Signed-off-by: Dominik Csapak > --- > no changes > proxmox-rest-server/src/worker_task.rs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs > index 51394549..a8899ab9 100644 > --- a/proxmox-rest-server/src/worker_task.rs > +++ b/proxmox-rest-server/src/worker_task.rs > @@ -494,7 +494,7 @@ impl TaskState { > match self { > TaskState::Error { message, .. } => format!("TASK ERROR: {}", message), > other => format!("TASK {}", other), > - } > + }.replace('\n', "\\n") // no newline in task result Why not `.trim_end()` ? A literal \n seems rather odd to me.. Comment suggestion: // our consumer already add \n where required, so avoid double-newline > } > > fn from_endtime_and_message(endtime: i64, s: &str) -> Result { >