X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PMG%2FRuleDB%2FRemove.pm;fp=PMG%2FRuleDB%2FRemove.pm;h=551fb97227ccf4d50ace24feb6505508bfef6a62;hb=365d5b9549d25a910c82cd37034f05e1c906565a;hp=1bb7a859c339743fde5c3f1cb6dd8b4a62ae0dce;hpb=9f7b563c0d7ee86fa0eb920c09e54656a6309e5d;p=pmg-api.git diff --git a/PMG/RuleDB/Remove.pm b/PMG/RuleDB/Remove.pm index 1bb7a85..551fb97 100644 --- a/PMG/RuleDB/Remove.pm +++ b/PMG/RuleDB/Remove.pm @@ -111,7 +111,7 @@ sub save { } sub delete_marked_parts { - my ($self, $queue, $entity, $html, $rtype, $marks) = @_; + my ($self, $queue, $entity, $html, $rtype, $marks, $rulename) = @_; my $nparts = []; @@ -155,8 +155,8 @@ sub delete_marked_parts { push (@$nparts, $ent); - syslog ('info', "%s: removed attachment $id ('%s')", - $queue->{logid}, $on); + syslog ('info', "%s: removed attachment $id ('%s', rule: %s)", + $queue->{logid}, $on, $rulename); } else { $self->delete_marked_parts($queue, $part, $html, $rtype, $marks); @@ -171,6 +171,8 @@ sub execute { my ($self, $queue, $ruledb, $mod_group, $targets, $msginfo, $vars, $marks) = @_; + my $rulename = $vars->{RULE}; + if (!$self->{all} && ($#$marks == -1)) { # no marks return; @@ -200,7 +202,7 @@ sub execute { $entity->head->delete('x-proxmox-tmp-aid'); } - $self->delete_marked_parts($queue, $entity, $html, $rtype, $marks); + $self->delete_marked_parts($queue, $entity, $html, $rtype, $marks, $rulename); if ($msginfo->{testmode}) { $entity->head->mime_attr('Content-type.boundary' => '------=_TEST123456') if $entity->is_multipart;