diff --git a/lib/utils.js b/lib/utils.js index da7e0636..a05963e1 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -326,9 +326,18 @@ function prettifyObject ({ * string. */ function prettifyTime ({ log, timestampKey = TIMESTAMP_KEY, translateFormat = undefined }) { - if (timestampKey in log === false && 'timestamp' in log === false) return undefined + let time = null + + if (timestampKey in log) { + time = log[timestampKey] + } else if ('timestamp' in log) { + time = log.timestamp + } + + if (time === null) return undefined if (translateFormat) { - return '[' + formatTime(log[timestampKey] || log.timestamp, translateFormat) + ']' + return '[' + formatTime(time, translateFormat) + ']' } - return `[${log[timestampKey] || log.timestamp}]` + + return `[${time}]` } diff --git a/test/lib/utils.public.test.js b/test/lib/utils.public.test.js index 4e330cb7..f3bc35ed 100644 --- a/test/lib/utils.public.test.js +++ b/test/lib/utils.public.test.js @@ -252,5 +252,15 @@ tap.test('prettifyTime', t => { t.is(str, '[2019-04-07T09:15:00.000-04:00]') }) + t.test('handles the 0 timestamp', async t => { + let log = { time: 0 } + let str = prettifyTime({ log }) + t.is(str, '[0]') + + log = { timestamp: 0 } + str = prettifyTime({ log }) + t.is(str, '[0]') + }) + t.end() })