proxmox-mirrors/pmg-log-tracker
1
0
Fork 0
mirror of https://git.proxmox.com/git/pmg-log-tracker synced 2025-08-11 19:59:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not assume constant year based on file index

Browse Source 
rather start with the current time at invocation and if the month in
the log is larger assume a year-wrap happened between logwriting and
invocation.

the old logic is flawed (but that can be said about parsing
traditional syslog timestamps (w/o year) in general) - it got worse
with the change in bullseye of rotating syslog weekly by default -
resulting in users losing one week of logs per day in the new year as
reported in https://forum.proxmox.com/threads/.102322/

Reviewed-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2022-01-03 17:09:54 +01:00
parent 6d693ce164
commit 1cdbebe57b
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main.rs
View File

@ -1722,7 +1722,7 @@ struct Parser {
current_record_state: RecordState, current_record_state: RecordState,
rel_line_nr: u64, rel_line_nr: u64,
current_year: [i64; 32], current_year: i64,
current_month: i64, current_month: i64,
current_file_index: usize, current_file_index: usize,
@ -1743,14 +1743,7 @@ struct Parser {
impl Parser { impl Parser {
fn new() -> Self { fn new() -> Self {
let mut years: [i64; 32] = [0; 32]; let ltime = time::now();
for (i, year) in years.iter_mut().enumerate() {
let mut ts = time::get_time();
ts.sec -= (3600 * 24 * i) as i64;
let ltime = time::at(ts);
*year = (ltime.tm_year + 1900) as i64;
}
Self { Self {
sentries: HashMap::new(), sentries: HashMap::new(),
@ -1760,8 +1753,8 @@ impl Parser {
smtp_tls_log_by_pid: HashMap::new(), smtp_tls_log_by_pid: HashMap::new(),
current_record_state: Default::default(), current_record_state: Default::default(),
rel_line_nr: 0, rel_line_nr: 0,
current_year: years, current_year: (ltime.tm_year + 1900) as i64,
current_month: 0, current_month: ltime.tm_mon as i64,
current_file_index: 0, current_file_index: 0,
count: 0, count: 0,
buffered_stdout: BufWriter::with_capacity(4 * 1024 * 1024, std::io::stdout()), buffered_stdout: BufWriter::with_capacity(4 * 1024 * 1024, std::io::stdout()),
@ -1848,8 +1841,8 @@ impl Parser {
let (time, line) = match parse_time( let (time, line) = match parse_time(
line, line,
self.current_year[self.current_file_index], self.current_year,
&mut self.current_month, self.current_month,
) { ) {
Some(t) => t, Some(t) => t,
None => continue, None => continue,
@ -1938,8 +1931,8 @@ impl Parser {
} }
if let Some((time, _)) = parse_time( if let Some((time, _)) = parse_time(
&buffer[0..size], &buffer[0..size],
self.current_year[i], self.current_year,
&mut self.current_month, self.current_month,
) { ) {
// found the earliest file in the time frame // found the earliest file in the time frame
if time < self.options.start { if time < self.options.start {
@ -1957,8 +1950,8 @@ impl Parser {
} }
if let Some((time, _)) = parse_time( if let Some((time, _)) = parse_time(
&buffer[0..size], &buffer[0..size],
self.current_year[i], self.current_year,
&mut self.current_month, self.current_month,
) { ) {
if time < self.options.start { if time < self.options.start {
break; break;
@ -2285,7 +2278,7 @@ fn parse_number(data: &[u8], max_digits: usize) -> Option<(usize, &[u8])> {
fn parse_time<'a>( fn parse_time<'a>(
data: &'a [u8], data: &'a [u8],
cur_year: i64, cur_year: i64,
cur_month: &mut i64, cur_month: i64,
) -> Option<(libc::time_t, &'a [u8])> { ) -> Option<(libc::time_t, &'a [u8])> {
if data.len() < 15 { if data.len() < 15 {
return None; return None;
@ -2311,19 +2304,17 @@ fn parse_time<'a>(
let mut ltime: libc::time_t; let mut ltime: libc::time_t;
let mut year = cur_year; let mut year = cur_year;
if *cur_month == 11 && mon == 0 { // assume smaller month now than in log line means yearwrap
year += 1; if cur_month < mon {
} year -= 1;
if mon > *cur_month {
*cur_month = mon;
} }
ltime = (year - 1970) * 365 + CAL_MTOD[mon as usize]; ltime = (year - 1970) * 365 + CAL_MTOD[mon as usize];
// leap year considerations
if mon <= 1 { if mon <= 1 {
year -= 1; year -= 1;
} }
ltime += (year - 1968) / 4; ltime += (year - 1968) / 4;
ltime -= (year - 1900) / 100; ltime -= (year - 1900) / 100;
ltime += (year - 1600) / 400; ltime += (year - 1600) / 400;