Archives/lnav
2
0
Fork 0
mirror of https://github.com/tstack/lnav synced 2024-11-17 15:29:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[date_time] do not change time format if there is a loss of precision

Browse Source
This commit is contained in:
Tim Stack 2023-08-15 21:14:37 -07:00
parent c464827737
commit 7572a68eaa
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/log_format.cc
View File

@ -72,6 +72,9 @@ external_log_format::mod_map_t external_log_format::MODULE_FORMATS;
std::vector<std::shared_ptr<external_log_format>>
external_log_format::GRAPH_ORDERED_FORMATS;
static const uint32_t DATE_TIME_SET_FLAGS = ETF_YEAR_SET | ETF_MONTH_SET
| ETF_DAY_SET | ETF_HOUR_SET | ETF_MINUTE_SET | ETF_SECOND_SET;
log_level_stats&
log_level_stats::operator|=(const log_level_stats& rhs)
{
@ -643,8 +646,26 @@ log_format::log_scanf(uint32_t line_number,
auto ls = this->lf_date_time.unlock();
retval = this->lf_date_time.scan(
ts->data(), ts->length(), nullptr, tm_out, *tv_out);
if (retval != nullptr) {
auto old_flags
= this->lf_timestamp_flags & DATE_TIME_SET_FLAGS;
auto new_flags = tm_out->et_flags & DATE_TIME_SET_FLAGS;
// It is unlikely a valid timestamp would lose much
// precision.
if (new_flags != old_flags) {
retval = nullptr;
}
}
if (retval == nullptr) {
this->lf_date_time.relock(ls);
} else {
log_debug(
"%d: changed time format to '%s' due to %.*s",
line_number,
PTIMEC_FORMAT_STR[this->lf_date_time.dts_fmt_lock],
ts->length(),
ts->data());
}
}

3
src/logfile_sub_source.cc
View File

@ -273,7 +273,8 @@ logfile_sub_source::text_value_for_line(textview_curses& tc,
value_out = this->lss_token_value;
}
if ((this->lss_token_file->is_time_adjusted()
if (!this->lss_token_line->is_continued()
&& (this->lss_token_file->is_time_adjusted()
|| (format->lf_timestamp_flags & ETF_ZONE_SET
&& format->lf_date_time.dts_zoned_to_local)
|| format->lf_timestamp_flags & ETF_MACHINE_ORIENTED