vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-28 23:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes nil epoch_begin (#6302)

Browse source
This commit is contained in:
Matteo Biscosi 2022-02-14 10:31:44 +01:00
parent 92fb853c31
commit f89ae72426
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/lua/modules/format_utils.lua
View file

@ -247,11 +247,11 @@ end
-- shorten an epoch when there is a well defined interval
function format_utils.formatEpochShort(epoch_begin, epoch_end, epoch)
local begin_day = os.date("!%d", epoch_begin + getFrontendTzSeconds())
local end_day = os.date("!%d", epoch_end + getFrontendTzSeconds())
local begin_day = os.date("!%d", (epoch_begin or os.time()) + getFrontendTzSeconds())
local end_day = os.date("!%d", (epoch_end or os.time()) + getFrontendTzSeconds())
if begin_day == end_day then
return os.date("!%X", epoch + getFrontendTzSeconds())
return os.date("!%X", (epoch or os.time()) + getFrontendTzSeconds())
end
return format_utils.formatEpoch(epoch)