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 CACAF651D6 for ; Tue, 1 Feb 2022 11:09:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C01392CE4B for ; Tue, 1 Feb 2022 11:09:34 +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 id 4A75D2CE3F for ; Tue, 1 Feb 2022 11:09:34 +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 1D7BC46137 for ; Tue, 1 Feb 2022 11:03:51 +0100 (CET) Message-ID: <69dacab1-fec5-c838-193e-314f8dc2721b@proxmox.com> Date: Tue, 1 Feb 2022 11:03:50 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Content-Language: en-US To: Stoiko Ivanov , pmg-devel@lists.proxmox.com References: <20220201094852.32422-1-s.ivanov@proxmox.com> From: Aaron Lauterer In-Reply-To: <20220201094852.32422-1-s.ivanov@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 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 NICE_REPLY_A -0.001 Looks like a legit reply (A) 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: Re: [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 10:09:34 -0000 Did a quick test on a production PMG. The log tracker is working fine again. Tested-By: Aaron Lauterer On 2/1/22 10:48, Stoiko Ivanov wrote: > 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) {