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 23679651EF for ; Tue, 1 Feb 2022 10:49:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1D9A42C924 for ; Tue, 1 Feb 2022 10:49:12 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 02BFF2C919 for ; Tue, 1 Feb 2022 10:49:11 +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 CB94445385 for ; Tue, 1 Feb 2022 10:49:04 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Tue, 1 Feb 2022 10:48:52 +0100 Message-Id: <20220201094852.32422-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.258 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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. [main.rs] Subject: [pmg-devel] [pmg-log-tracker] fix logfile counting in months != january 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, 01 Feb 2022 09:49:12 -0000 the changes introduced in 1cdbebe57b2ddc255db240d7dbaf2165c482986d changed the date handling to have current_month and current_year represent the month and year at time of invocation. This change was not carried over to the logfile collecting, which set the current month to january. Signed-off-by: Stoiko Ivanov --- * sorry for missing this in the first round of patches (hardcoded january was overlooked in january...) * tested with logs from a live-system. src/main.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index fb06463..2ba1b99 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1802,7 +1802,6 @@ impl Parser { } else { let filecount = self.count_files_in_time_range(); for i in (0..filecount).rev() { - self.current_month = 0; if let Ok(file) = File::open(LOGFILES[i]) { self.current_file_index = i; if i > 1 { @@ -1916,7 +1915,6 @@ impl Parser { let mut buffer = Vec::new(); for (i, item) in LOGFILES.iter().enumerate() { - self.current_month = 0; count = i; if let Ok(file) = File::open(item) { -- 2.30.2