From e8dbfc506c9a74256df2cb2e6ad7bcbc647ea183 Mon Sep 17 00:00:00 2001 From: Max Carrara Date: Tue, 2 Apr 2024 16:55:13 +0200 Subject: [PATCH] cephconfig: change code style inside config writer 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 Tested-by: Friedrich Weber --- src/PVE/CephConfig.pm | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/PVE/CephConfig.pm b/src/PVE/CephConfig.pm index 6b10d46..9934fd5 100644 --- a/src/PVE/CephConfig.pm +++ b/src/PVE/CephConfig.pm @@ -65,28 +65,35 @@ 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$/; + $out .= "[$section]\n"; - foreach my $key (sort keys %{$cfg->{$section}}) { + for my $key (sort keys $cfg->{$section}->%*) { $out .= "\t $key = $cfg->{$section}->{$key}\n"; } $out .= "\n"; } }; - &$cond_write_sec('global'); - &$cond_write_sec('client'); + my @rexprs = ( + qr/global/, + 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\..*/, + ); + + for my $re (@rexprs) { + $cond_write_sec->($re); + } return $out; }