Add rule name to RuleAction logging

[pmg-api.git] / PMG / RuleDB / Quarantine.pm

diff --git a/PMG/RuleDB/Quarantine.pm b/PMG/RuleDB/Quarantine.pm
index eb423a750e2f77bf6a3c082f86a330f49111d96a..487fa6ef71b7f7c39a25a05f8df21d1934d2dc0f 100644 (file)
--- a/PMG/RuleDB/Quarantine.pm
+++ b/PMG/RuleDB/Quarantine.pm
@@ -89,6 +89,8 @@ sub execute {
     
     my $subgroups = $mod_group->subgroups($targets, 1);
 
+    my $rulename = $vars->{RULE};
+
     foreach my $ta (@$subgroups) {
        my ($tg, $entity) = (@$ta[0], @$ta[1]);
 
@@ -98,7 +100,7 @@ sub execute {
            if (my $qid = $queue->quarantine_mail($ruledb, 'V', $entity, $tg, $msginfo, $vars, $ldap)) {
 
                foreach (@$tg) {
-                   syslog ('info', "$queue->{logid}: moved mail for <%s> to virus quarantine - $qid", $_);
+                   syslog ('info', "$queue->{logid}: moved mail for <%s> to virus quarantine (rule: %s, %s)", $_, $rulename, $qid);
                }
 
                $queue->set_status ($tg, 'delivered');
@@ -108,7 +110,7 @@ sub execute {
            if (my $qid = $queue->quarantine_mail($ruledb, 'S', $entity, $tg, $msginfo, $vars, $ldap)) {
 
                foreach (@$tg) {
-                   syslog ('info', "$queue->{logid}: moved mail for <%s> to spam quarantine - $qid", $_);
+                   syslog ('info', "$queue->{logid}: moved mail for <%s> to spam quarantine (rule: %s, %s)", $_, $rulename, $qid);
                }
 
                $queue->set_status($tg, 'delivered');