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 6E7DB90ED6 for ; Tue, 13 Feb 2024 11:30:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4ABAC34601 for ; Tue, 13 Feb 2024 11:30:04 +0100 (CET) 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 for ; Tue, 13 Feb 2024 11:30:03 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 52FCE47B7E for ; Tue, 13 Feb 2024 11:30:03 +0100 (CET) Date: Tue, 13 Feb 2024 11:29:56 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240213095320.186188-1-m.sandoval@proxmox.com> <20240213095320.186188-2-m.sandoval@proxmox.com> In-Reply-To: <20240213095320.186188-2-m.sandoval@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1707820127.h18zlfv62d.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 1 AWL -0.386 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy FSL_BULK_SIG 0.001 Bulk signature with no Unsubscribe KAM_ASCII_DIVIDERS 0.8 Email that uses ascii formatting dividers and possible spam tricks KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RAZOR2_CF_RANGE_51_100 1.886 Razor2 gives confidence level above 50% RAZOR2_CHECK 0.922 Listed in Razor2 (http://razor.sf.net/) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [185.199.109.153, 185.199.108.153, 185.199.110.153, 185.199.111.153] Subject: Re: [pbs-devel] [PATCH backup 2/4] backup-proxy: avoid block in if condition 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, 13 Feb 2024 10:30:34 -0000 On February 13, 2024 10:53 am, Maximiliano Sandoval wrote: > Fixes the clippy lint: >=20 > ``` > warning: in a `match` scrutinee, avoid complex blocks or closures with bl= ocks; instead, move the block or closure higher and bind it with a `let` > --> src/bin/proxmox-backup-proxy.rs:874:58 > | > 874 | let stats =3D match tokio::task::spawn_blocking(|| { > | __________________________________________________________^ > 875 | | let hoststats =3D collect_host_stats_sync(); > 876 | | let (hostdisk, datastores) =3D collect_disk_stats_syn= c(); > 877 | | Arc::new((hoststats, hostdisk, datastores)) > 878 | | }) > | |_________^ > | > =3D help: for further information visit https://rust-lang.github.io/r= ust-clippy/master/index.html#blocks_in_conditions > =3D note: `#[warn(clippy::blocks_in_conditions)]` on by default > ``` >=20 > Signed-off-by: Maximiliano Sandoval > --- > src/bin/proxmox-backup-proxy.rs | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) >=20 > diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-pro= xy.rs > index 9c49026b..b6e1fdd7 100644 > --- a/src/bin/proxmox-backup-proxy.rs > +++ b/src/bin/proxmox-backup-proxy.rs > @@ -871,13 +871,12 @@ async fn run_stat_generator() { > loop { > let delay_target =3D Instant::now() + Duration::from_secs(10); > =20 > - let stats =3D match tokio::task::spawn_blocking(|| { > + let stats_res =3D tokio::task::spawn_blocking(|| { nit: called _res , but this is actually the future.. either stats_future, o= r await it directly instead of below. it could also be somewhat simplified by doing match stats_res { Ok(stats) =3D> { // do all the broadcasting here }, Err(err) =3D> { // log error here }, }; // sleep here but that also increases the level of nesting for the broadcasting part, so it's not a 100% win ;) > let hoststats =3D collect_host_stats_sync(); > let (hostdisk, datastores) =3D collect_disk_stats_sync(); > Arc::new((hoststats, hostdisk, datastores)) > - }) > - .await > - { > + }); > + let stats =3D match stats_res.await { > Ok(res) =3D> res, > Err(err) =3D> { > log::error!("collecting host stats panicked: {err}"); > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel >=20 >=20 >=20