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 8066467756 for ; Fri, 31 Jul 2020 14:44:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 488AD1D95D for ; Fri, 31 Jul 2020 14:43:33 +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 CD24C1D921 for ; Fri, 31 Jul 2020 14:43:31 +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 90CED43444 for ; Fri, 31 Jul 2020 14:43:31 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 31 Jul 2020 14:43:23 +0200 Message-Id: <20200731124330.30576-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200731124330.30576-1-d.csapak@proxmox.com> References: <20200731124330.30576-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.053 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 Subject: [pbs-devel] [PATCH proxmox-backup 1/8] worker_task: refactor log text generator 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: Fri, 31 Jul 2020 12:44:03 -0000 we will need this elsewhere, so pull it out Signed-off-by: Dominik Csapak --- src/server/worker_task.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs index af6686fd..f6882d13 100644 --- a/src/server/worker_task.rs +++ b/src/server/worker_task.rs @@ -502,17 +502,23 @@ impl WorkerTask { Ok(upid_str) } - /// Log task result, remove task from running list - pub fn log_result(&self, result: &Result<(), Error>) { + /// get the Text of the result + pub fn get_log_text(&self, result: &Result<(), Error>) -> String { let warn_count = self.data.lock().unwrap().warn_count; + if let Err(err) = result { - self.log(&format!("TASK ERROR: {}", err)); + format!("ERROR: {}", err) } else if warn_count > 0 { - self.log(format!("TASK WARNINGS: {}", warn_count)); + format!("WARNINGS: {}", warn_count) } else { - self.log("TASK OK"); + "OK".to_string() } + } + + /// Log task result, remove task from running list + pub fn log_result(&self, result: &Result<(), Error>) { + self.log(format!("TASK {}", self.get_log_text(result))); WORKER_TASK_LIST.lock().unwrap().remove(&self.upid.task_id); let _ = update_active_workers(None); -- 2.20.1