dkim: add QID in warnings

adding the QID in warnings allows those log lines to be picked up by the
pmg-log-tracker. this way the warnings show up in the tracking center.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>

diff --git a/src/PMG/RuleDB/Accept.pm b/src/PMG/RuleDB/Accept.pm
index d14c2fbd512442e53d1a03b99fbd464a6fe9b911..e3e39a71b40d89176bc445d1426351beeeff33f3 100644 (file)
--- a/src/PMG/RuleDB/Accept.pm
+++ b/src/PMG/RuleDB/Accept.pm
@@ -104,8 +104,12 @@ sub execute {
            eval {
                $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}
+               );
+           }
        }
 
 

diff --git a/src/PMG/RuleDB/BCC.pm b/src/PMG/RuleDB/BCC.pm
index 65b6fb55a95b3ec8dc09a41fd27ee41dfacba603..81301cfd0abeeae51c1420946cc04b5bece8748e 100644 (file)
--- a/src/PMG/RuleDB/BCC.pm
+++ b/src/PMG/RuleDB/BCC.pm
@@ -144,8 +144,12 @@ sub execute {
            eval {
                $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}) {