public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Mira Limbeck <m.limbeck@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [pmg-log-tracker] fix logfile counting in months != january
Date: Tue, 1 Feb 2022 12:00:35 +0100	[thread overview]
Message-ID: <65fc9351-40e1-fc9e-cd04-29fd585a3c30@proxmox.com> (raw)
In-Reply-To: <20220201094852.32422-1-s.ivanov@proxmox.com>

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) {




  parent reply	other threads:[~2022-02-01 11:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-01  9:48 Stoiko Ivanov
2022-02-01 10:03 ` Aaron Lauterer
2022-02-01 11:00 ` Mira Limbeck [this message]
2022-02-01 12:35 ` [pmg-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=65fc9351-40e1-fc9e-cd04-29fd585a3c30@proxmox.com \
    --to=m.limbeck@proxmox.com \
    --cc=pmg-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal