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 4DD5597AB3 for ; Tue, 5 Mar 2024 16:08:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 98F3EAF56 for ; Tue, 5 Mar 2024 16:08:08 +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, 5 Mar 2024 16:08:06 +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 DA58D44127 for ; Tue, 5 Mar 2024 16:08:05 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Tue, 5 Mar 2024 16:07:52 +0100 Message-Id: <20240305150758.252669-11-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240305150758.252669-1-m.carrara@proxmox.com> References: <20240305150758.252669-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 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 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 - Subject: [pve-devel] [PATCH v4 pve-storage 10/16] cephconfig: change code style inside config writer X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Mar 2024 15:08:40 -0000 This commit changes the code style of subroutine `write_ceph_config` to match our style guide [0] more. Furthermore, the repeated calls to the inner subroutine are replaced with a loop, while the regular expressions used by the inner sub are now quoted with `qr` to prevent any accidental mis-quotings in the future. [0]: https://pve.proxmox.com/wiki/Perl_Style_Guide Signed-off-by: Max Carrara --- Changes v2 --> v3: * new; initial style changes moved from patch 06 of series v2 * `qr` operator for regexes to avoid character escaping issues * call `$cond_write_sec` in loop Changes v3 --> v4: * use postfix deref ($hashref->%* instead of %$hashref) * rebased due to previous changes src/PVE/CephConfig.pm | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/PVE/CephConfig.pm b/src/PVE/CephConfig.pm index da28940..a361a5b 100644 --- a/src/PVE/CephConfig.pm +++ b/src/PVE/CephConfig.pm @@ -98,12 +98,12 @@ sub write_ceph_config { my $cond_write_sec = sub { my $re = shift; - foreach my $section (sort keys %$cfg) { + for my $section (sort keys $cfg->%*) { next if $section !~ m/^$re$/; next if exists($written_sections->{$section}); $out .= "[$section]\n"; - foreach my $key (sort keys %{$cfg->{$section}}) { + for my $key (sort keys $cfg->{$section}->%*) { my $value = $cfg->{$section}->{$key}; # escape comment literals $value =~ s/(#|;)/\\$1/g; @@ -116,21 +116,27 @@ sub write_ceph_config { } }; - &$cond_write_sec('global'); - &$cond_write_sec('client'); - &$cond_write_sec('client\..*'); + my @rexprs = ( + qr/global/, + qr/client/, + qr/client\..*/, - &$cond_write_sec('mds'); - &$cond_write_sec('mon'); - &$cond_write_sec('osd'); - &$cond_write_sec('mgr'); + qr/mds/, + qr/mon/, + qr/osd/, + qr/mgr/, - &$cond_write_sec('mds\..*'); - &$cond_write_sec('mon\..*'); - &$cond_write_sec('osd\..*'); - &$cond_write_sec('mgr\..*'); + qr/mds\..*/, + qr/mon\..*/, + qr/osd\..*/, + qr/mgr\..*/, - &$cond_write_sec('.*'); + qr/.*/, + ); + + for my $re (@rexprs) { + $cond_write_sec->($re); + } return $out; } -- 2.39.2