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 F2D86E68B for ; Tue, 18 Jul 2023 18:01:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D89091DD97 for ; Tue, 18 Jul 2023 18:01:08 +0200 (CEST) Received: from nena.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Tue, 18 Jul 2023 18:01:05 +0200 (CEST) Received: by nena.proxmox.com (Postfix, from userid 1000) id DA3932E610F; Tue, 18 Jul 2023 18:01:04 +0200 (CEST) From: Mira Limbeck To: pmg-devel@lists.proxmox.com Date: Tue, 18 Jul 2023 18:01:01 +0200 Message-Id: <20230718160101.1070267-2-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230718160101.1070267-1-m.limbeck@proxmox.com> References: <20230718160101.1070267-1-m.limbeck@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.646 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [mailtracker.pm] Subject: [pmg-devel] [RFC api] MailTracker: remove timezone offset 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: Tue, 18 Jul 2023 16:01:39 -0000 The timezone offset is moved to `pmg-log-tracker` in the compatibility code path. This way the new rfc3339 timestamp, which is already in UTC, can be used as is. Signed-off-by: Mira Limbeck --- This change only makes sense in combination with the log-tracker one. Please DO NOT apply any of those 2 patches without the other one. src/PMG/API2/MailTracker.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/PMG/API2/MailTracker.pm b/src/PMG/API2/MailTracker.pm index b8b25ad..ffda4b5 100644 --- a/src/PMG/API2/MailTracker.pm +++ b/src/PMG/API2/MailTracker.pm @@ -43,8 +43,6 @@ my $run_pmg_log_tracker = sub { my $logids = {}; - my $timezone = tz_local_offset();; - if (defined(my $id = $includelog)) { if ($id =~ m/^Q([a-f0-9]+)R([a-f0-9]+)$/i) { $logids->{$1} = 1; @@ -128,7 +126,7 @@ my $run_pmg_log_tracker = sub { } elsif ($line =~ m/^TO:([0-9A-F]+):([0-9A-F]+):([0-9A-Z]):\s+from <([^>]*)>\s+to\s+<([^>]+)>\s+\((\S+)\)$/) { my $new = { size => $entry->{size} // 0, - time => hex($1) - $timezone, + time => hex($1), qid => $2, dstatus => $3, from => $4, @@ -174,7 +172,7 @@ my $run_pmg_log_tracker = sub { } elsif ($line =~ m/^TO:([0-9A-F]+):(T[0-9A-F]+L[0-9A-F]+):([0-9A-Z]):\s+from <([^>]*)>\s+to\s+<([^>]*)>$/) { my $e = {}; $e->{client} = $entry->{client} if defined($entry->{client}); - $e->{time} = hex($1) - $timezone; + $e->{time} = hex($1); $e->{id} = $2; $e->{dstatus} = $3; $e->{from} = $4; -- 2.39.2