Add default rulename of 'unknown' to Actions

To provide a better experience while logging - set the name to 'unknown' in
case it's not defined. Related to #2232

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

diff --git a/PMG/RuleDB/Accept.pm b/PMG/RuleDB/Accept.pm
index 1387e2428453650d4a1d505ce77581ac3ae3d7a6..79fb0d870cd8384892d4c1f4ca0350a8a3dfb0df 100644 (file)
--- a/PMG/RuleDB/Accept.pm
+++ b/PMG/RuleDB/Accept.pm
@@ -91,7 +91,7 @@ sub execute {
 
     my $subgroups = $mod_group->subgroups($targets, 1);
 
 
     my $subgroups = $mod_group->subgroups($targets, 1);
 

-    my $rulename = $vars->{RULE};
+    my $rulename = $vars->{RULE} // 'unknown';

 
     foreach my $ta (@$subgroups) {
        my ($tg, $entity) = (@$ta[0], @$ta[1]);
 
     foreach my $ta (@$subgroups) {
        my ($tg, $entity) = (@$ta[0], @$ta[1]);

diff --git a/PMG/RuleDB/BCC.pm b/PMG/RuleDB/BCC.pm
index cbe28105b030ace0cb9e016039129200a674b292..be695f710b6b94f1e31123688ca94faba15ed931 100644 (file)
--- a/PMG/RuleDB/BCC.pm
+++ b/PMG/RuleDB/BCC.pm
@@ -114,7 +114,7 @@ sub execute {
 
     my $subgroups = $mod_group->subgroups($targets, 1);
 
 
     my $subgroups = $mod_group->subgroups($targets, 1);
 

-    my $rulename = $vars->{RULE};
+    my $rulename = $vars->{RULE} // 'unknown';

 
     my $bcc_to = PMG::Utils::subst_values($self->{target}, $vars);
 
 
     my $bcc_to = PMG::Utils::subst_values($self->{target}, $vars);
 

diff --git a/PMG/RuleDB/Block.pm b/PMG/RuleDB/Block.pm
index c7c640efe3253f3ee5e6e5c33f8fc21371d60583..c758787e58aff0b3fac21e928435269123aefda6 100644 (file)
--- a/PMG/RuleDB/Block.pm
+++ b/PMG/RuleDB/Block.pm
@@ -89,7 +89,7 @@ sub execute {
     my ($self, $queue, $ruledb, $mod_group, $targets, 
        $msginfo, $vars, $marks) = @_;
 
     my ($self, $queue, $ruledb, $mod_group, $targets, 
        $msginfo, $vars, $marks) = @_;
 

-    my $rulename = $vars->{RULE};
+    my $rulename = $vars->{RULE} // 'unknown';

 
     if ($msginfo->{testmode}) {
        my $fh = $msginfo->{test_fh};
 
     if ($msginfo->{testmode}) {
        my $fh = $msginfo->{test_fh};

diff --git a/PMG/RuleDB/Notify.pm b/PMG/RuleDB/Notify.pm
index 20d87afae2607f886b1249717a834c451c71a87f..860b5ce4e5f23041e704273de1294cb2c302014b 100644 (file)
--- a/PMG/RuleDB/Notify.pm
+++ b/PMG/RuleDB/Notify.pm
@@ -207,7 +207,7 @@ sub execute {
 
     my $from = 'postmaster';
 
 
     my $from = 'postmaster';
 

-    my $rulename = $vars->{RULE};
+    my $rulename = $vars->{RULE} // 'unknown';

 
     my $body = PMG::Utils::subst_values($self->{body}, $vars);
     my $subject = PMG::Utils::subst_values($self->{subject}, $vars);
 
     my $body = PMG::Utils::subst_values($self->{body}, $vars);
     my $subject = PMG::Utils::subst_values($self->{subject}, $vars);

diff --git a/PMG/RuleDB/Quarantine.pm b/PMG/RuleDB/Quarantine.pm
index 487fa6ef71b7f7c39a25a05f8df21d1934d2dc0f..aaa8623f9672c77fdd5448175d0c394ad253118a 100644 (file)
--- a/PMG/RuleDB/Quarantine.pm
+++ b/PMG/RuleDB/Quarantine.pm
@@ -89,7 +89,7 @@ sub execute {
     
     my $subgroups = $mod_group->subgroups($targets, 1);
 
     
     my $subgroups = $mod_group->subgroups($targets, 1);
 

-    my $rulename = $vars->{RULE};
+    my $rulename = $vars->{RULE} // 'unknown';

 
     foreach my $ta (@$subgroups) {
        my ($tg, $entity) = (@$ta[0], @$ta[1]);
 
     foreach my $ta (@$subgroups) {
        my ($tg, $entity) = (@$ta[0], @$ta[1]);

diff --git a/PMG/RuleDB/Remove.pm b/PMG/RuleDB/Remove.pm
index 551fb97227ccf4d50ace24feb6505508bfef6a62..e6105325339600d80f20185933bd575c7a9eea11 100644 (file)
--- a/PMG/RuleDB/Remove.pm
+++ b/PMG/RuleDB/Remove.pm
@@ -171,7 +171,7 @@ sub execute {
     my ($self, $queue, $ruledb, $mod_group, $targets,
        $msginfo, $vars, $marks) = @_;
 
     my ($self, $queue, $ruledb, $mod_group, $targets,
        $msginfo, $vars, $marks) = @_;
 

-    my $rulename = $vars->{RULE};
+    my $rulename = $vars->{RULE} // 'unknown';

 
     if (!$self->{all} && ($#$marks == -1)) {
        # no marks
 
     if (!$self->{all} && ($#$marks == -1)) {
        # no marks

diff --git a/PMG/RuleDB/ReportSpam.pm b/PMG/RuleDB/ReportSpam.pm
index a3e06eea5746dadafadba21f663bb4096034597c..e0ac004a99d33bd294c492fbc0c508fb7724b69b 100644 (file)
--- a/PMG/RuleDB/ReportSpam.pm
+++ b/PMG/RuleDB/ReportSpam.pm
@@ -85,7 +85,7 @@ sub execute {
     my ($self, $queue, $ruledb, $mod_group, $targets, 
        $msginfo, $vars, $marks) = @_;
 
     my ($self, $queue, $ruledb, $mod_group, $targets, 
        $msginfo, $vars, $marks) = @_;
 

-    my $rulename = $vars->{RULE};
+    my $rulename = $vars->{RULE} // 'unknown';

 
     my $subgroups = $mod_group->subgroups($targets);
 
 
     my $subgroups = $mod_group->subgroups($targets);