[PATCH pve-firewall 2/3] firewall: parser: factor out error logging

[Arthur Bied-Charreton <a.bied-charreton@proxmox.com>]

The next commit will add a new caller.

Also print errors in deterministic order, no functional changes intended
besides that.

Signed-off-by: Arthur Bied-Charreton <a.bied-charreton@proxmox.com>
---
 src/PVE/Firewall.pm | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index dd5d92c..a1fd6a3 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -3343,6 +3343,19 @@ sub get_mark_values {
     return ($value, $mask);
 }
 
+my $log_rule_errors = sub {
+    my ($prefix, $line, $rule) = @_;
+
+    # The verbose flag really means we're running from the CLI and want
+    # output on the console - in the other case we really want such errors
+    # to go into the syslog instead.
+    my $log = $verbose ? sub { warn @_ } : sub { syslog(err => @_) };
+    $log->("$prefix - errors in rule parameters: $line\n");
+    for my $p (sort keys $rule->{errors}->%*) {
+        $log->("  $p: $rule->{errors}->{$p}\n");
+    }
+};
+
 sub parse_fw_rule {
     my ($prefix, $line, $cluster_conf, $fw_conf, $rule_env) = @_;
 
@@ -3417,16 +3430,7 @@ sub parse_fw_rule {
     die "unable to parse rule parameters: $line\n" if length($line);
 
     $rule = verify_rule($rule, $cluster_conf, $fw_conf, $rule_env, 1);
-    if ($rule->{errors}) {
-        # The verbose flag really means we're running from the CLI and want
-        # output on the console - in the other case we really want such errors
-        # to go into the syslog instead.
-        my $log = $verbose ? sub { warn @_ } : sub { syslog(err => @_) };
-        $log->("$prefix - errors in rule parameters: $orig_line\n");
-        foreach my $p (keys %{ $rule->{errors} }) {
-            $log->("  $p: $rule->{errors}->{$p}\n");
-        }
-    }
+    $log_rule_errors->($prefix, $orig_line, $rule) if $rule->{errors};
 
     return $rule;
 }
-- 
2.47.3