@@ -325,32 +325,31 @@ function createWrap (self, opts, rootLogger, level) {
325
325
326
326
function asObject ( logger , level , args , ts , formatters = { } ) {
327
327
const {
328
- level : levelFormatter
328
+ level : levelFormatter = ( ) => logger . levels . values [ level ] ,
329
+ log : logObjectFormatter = ( obj ) => obj
329
330
} = formatters
330
331
if ( logger . _serialize ) applySerializers ( args , logger . _serialize , logger . serializers , logger . _stdErrSerialize )
331
332
const argsCloned = args . slice ( )
332
333
let msg = argsCloned [ 0 ]
333
- const o = { }
334
+ const logObject = { }
334
335
if ( ts ) {
335
- o . time = ts
336
- }
337
- if ( levelFormatter ) {
338
- const formattedLevel = levelFormatter ( level , logger . levels . values [ level ] )
339
- Object . assign ( o , formattedLevel )
340
- } else {
341
- o . level = logger . levels . values [ level ]
336
+ logObject . time = ts
342
337
}
338
+ logObject . level = levelFormatter ( level , logger . levels . values [ level ] )
339
+
343
340
let lvl = ( logger . _childLevel | 0 ) + 1
344
341
if ( lvl < 1 ) lvl = 1
345
342
// deliberate, catching objects, arrays
346
343
if ( msg !== null && typeof msg === 'object' ) {
347
344
while ( lvl -- && typeof argsCloned [ 0 ] === 'object' ) {
348
- Object . assign ( o , argsCloned . shift ( ) )
345
+ Object . assign ( logObject , argsCloned . shift ( ) )
349
346
}
350
347
msg = argsCloned . length ? format ( argsCloned . shift ( ) , argsCloned ) : undefined
351
348
} else if ( typeof msg === 'string' ) msg = format ( argsCloned . shift ( ) , argsCloned )
352
- if ( msg !== undefined ) o . msg = msg
353
- return o
349
+ if ( msg !== undefined ) logObject . msg = msg
350
+
351
+ const formattedLogObject = logObjectFormatter ( logObject )
352
+ return formattedLogObject
354
353
}
355
354
356
355
function applySerializers ( args , serialize , serializers , stdErrSerialize ) {
0 commit comments