From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 791B49641F for ; Thu, 29 Feb 2024 15:25:10 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5A72814AA9 for ; Thu, 29 Feb 2024 15:25:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 29 Feb 2024 15:25:09 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7DF5947FD9 for ; Thu, 29 Feb 2024 15:25:09 +0100 (CET) Date: Thu, 29 Feb 2024 15:25:08 +0100 From: Stoiko Ivanov To: Mira Limbeck Cc: pmg-devel@lists.proxmox.com Message-ID: <20240229152508.6095b85f@rosa.proxmox.com> In-Reply-To: <20240229134752.170724-1-m.limbeck@proxmox.com> References: <20240229134752.170724-1-m.limbeck@proxmox.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [bcc.pm, accept.pm] Subject: [pmg-devel] applied: [PATCH pmg-api] dkim: add QID in warnings X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Feb 2024 14:25:10 -0000 Thanks for addressing this so quickly - since I had my test-setup still around I gave it a spin and checked it works. - applied On Thu, 29 Feb 2024 14:47:53 +0100 Mira Limbeck wrote: > 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 > --- > src/PMG/RuleDB/Accept.pm | 8 ++++++-- > src/PMG/RuleDB/BCC.pm | 8 ++++++-- > 2 files changed, 12 insertions(+), 4 deletions(-) > > diff --git a/src/PMG/RuleDB/Accept.pm b/src/PMG/RuleDB/Accept.pm > index d14c2fb..e3e39a7 100644 > --- 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 65b6fb5..81301cf 100644 > --- 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}) {