[pmg-devel] [pmg-log-tracker] fix logfile counting in months != january

[pmg-devel] [pmg-log-tracker] fix logfile counting in months != january

[Stoiko Ivanov]

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 <s.ivanov@proxmox.com>
---
* 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

Re: [pmg-devel] [pmg-log-tracker] fix logfile counting in months != january

[Aaron Lauterer]

Did a quick test on a production PMG. The log tracker is working fine again.

Tested-By: Aaron Lauterer <a.lauterer@proxmox.com>


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 <s.ivanov@proxmox.com>
> ---
> * 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) {

Re: [pmg-devel] [pmg-log-tracker] fix logfile counting in months != january

[Mira Limbeck]

Looks good to me.

After reviewing the mentioned commit, it makes sense to not set 
self.current_month outside of Parser::new().

We no longer use it as variable for the current month in the logs, but 
rather as current month at the time of pmg-log-tracker invocation. And 
in turn we calculate all time relative to this month.

This in turn means all logs from future months will be parsed as from 
the previous year.

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 <s.ivanov@proxmox.com>
> ---
> * 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) {

[pmg-devel] applied: [pmg-log-tracker] fix logfile counting in months != january

[Thomas Lamprecht]

On 01.02.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 <s.ivanov@proxmox.com>
> ---
> * 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(-)
> 
>

applied, thanks!