Add default rulename of 'unknown' to Actions

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

diff --git a/PMG/RuleDB/Accept.pm b/PMG/RuleDB/Accept.pm
index 0271fcf19e0d8275e38b73a77628a9e74c08811d..79fb0d870cd8384892d4c1f4ca0350a8a3dfb0df 100644 (file)
--- a/PMG/RuleDB/Accept.pm
+++ b/PMG/RuleDB/Accept.pm
@@ -2,8 +2,8 @@ package PMG::RuleDB::Accept;
 
 use strict;
 use warnings;
-use Carp;
 use DBI;
+use Encode;
 
 use PVE::SafeSyslog;
 use Digest::SHA;
@@ -26,14 +26,6 @@ sub otype_text {
     return 'Accept';
 }
 
-sub oicon {
-    return 'accept.gif';
-}
-
-sub oinfo {
-    return 'Accept mail for delivery.';
-}
-
 sub oisedit {
     return 0;   
 }
@@ -51,7 +43,7 @@ sub new {
     
     my $class = ref($type) || $type;
  
-    my $self = $class->SUPER::new(otype(), $ogroup);
+    my $self = $class->SUPER::new($class->otype(), $ogroup);
    
     return $self;
 }
@@ -99,6 +91,8 @@ sub execute {
 
     my $subgroups = $mod_group->subgroups($targets, 1);
 
+    my $rulename = $vars->{RULE} // 'unknown';
+
     foreach my $ta (@$subgroups) {
        my ($tg, $entity) = (@$ta[0], @$ta[1]);
 
@@ -119,12 +113,12 @@ sub execute {
                $msginfo->{xforward}, $msginfo->{fqdn});
            if ($qid) {
                foreach (@$tg) {
-                   syslog('info', "%s: accept mail to <%s> (%s)", $queue->{logid}, $_, $qid);
+                   syslog('info', "%s: accept mail to <%s> (rule: %s, %s)", $queue->{logid}, encode('UTF-8', $_), $rulename, $qid);
                }
                $queue->set_status ($tg, 'delivered', $qid);
            } else {
                foreach (@$tg) {
-                   syslog('err', "%s: reinject mail to <%s> failed", $queue->{logid}, $_);
+                   syslog('err', "%s: reinject mail to <%s> (rule: %s) failed", $queue->{logid}, encode('UTF-8', $_), $rulename);
                }
                if ($code) {
                    my $resp = substr($code, 0, 1);