dkim: add QID in warnings

[pmg-api.git] / src / PMG / RuleDB / BCC.pm

diff --git a/src/PMG/RuleDB/BCC.pm b/src/PMG/RuleDB/BCC.pm
index 0f016f82cfcffbe4031fe19b0d018cfdaedb74f6..81301cfd0abeeae51c1420946cc04b5bece8748e 100644 (file)
--- a/src/PMG/RuleDB/BCC.pm
+++ b/src/PMG/RuleDB/BCC.pm
@@ -142,11 +142,14 @@ sub execute {
        my $dkim = $msginfo->{dkim} // {};
        if ($dkim->{sign}) {
            eval {
-               $entity = PMG::DKIMSign::sign_entity($entity,
-                   $dkim->{selector}, $msginfo->{sender}, $dkim->{sign_all});
+               $entity = PMG::DKIMSign::sign_entity($entity, $dkim, $msginfo->{sender});
            };
-           syslog('warning',
-               "Could not create DKIM-Signature - disabling Signing: $@") if $@;
+           if ($@) {
+               syslog('warning',
+                   "%s: Could not create DKIM-Signature - disabling Signing: $@",
+                   $queue->{logid}
+               );
+           }
        }
 
        if ($msginfo->{testmode}) {