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 ABD2660E5B for ; Fri, 25 Sep 2020 16:13:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D6F491C23E for ; Fri, 25 Sep 2020 16:13: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 891F91C181 for ; Fri, 25 Sep 2020 16:13:29 +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 54168456E6 for ; Fri, 25 Sep 2020 16:13:29 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 25 Sep 2020 16:13:19 +0200 Message-Id: <20200925141327.25024-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200925141327.25024-1-d.csapak@proxmox.com> References: <20200925141327.25024-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.174 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 03/10] server/worker_task: factor out task list rendering 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, 25 Sep 2020 14:13:35 -0000 we will need this later again Signed-off-by: Dominik Csapak --- src/server/worker_task.rs | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs index d220e755..3b47dfb6 100644 --- a/src/server/worker_task.rs +++ b/src/server/worker_task.rs @@ -425,15 +425,7 @@ fn update_active_workers(new_upid: Option<&UPID>) -> Result, E } }); - let mut raw = String::new(); - for info in &task_list { - if let Some(status) = &info.state { - raw.push_str(&format!("{} {:08X} {}\n", info.upid_str, status.endtime(), status)); - } else { - raw.push_str(&info.upid_str); - raw.push('\n'); - } - } + let raw = render_task_list(&task_list[..]); replace_file( PROXMOX_BACKUP_ACTIVE_TASK_FN, @@ -455,6 +447,26 @@ pub fn read_task_list() -> Result, Error> { update_active_workers(None) } +fn render_task_line(info: &TaskListInfo) -> String { + let mut raw = String::new(); + if let Some(status) = &info.state { + raw.push_str(&format!("{} {:08X} {}\n", info.upid_str, status.endtime(), status)); + } else { + raw.push_str(&info.upid_str); + raw.push('\n'); + } + + raw +} + +fn render_task_list(list: &[TaskListInfo]) -> String { + let mut raw = String::new(); + for info in list { + raw.push_str(&render_task_line(&info)); + } + raw +} + /// Launch long running worker tasks. /// /// A worker task can either be a whole thread, or a simply tokio -- 2.20.1