Skip to content

Commit dedd89e

Browse files
committed
add logging tests and fix misc bugs
1 parent fe54a08 commit dedd89e

File tree

3 files changed

+877
-12
lines changed

3 files changed

+877
-12
lines changed

index.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,8 @@ class API {
276276

277277
// Generate access log
278278
if ((this._logger.access || response._request._logs.length > 0) && this._logger.access !== 'never') {
279-
let access = this._logger.log(
280-
'access',
281-
undefined,
282-
response._request,
283-
response._request.context,
279+
let access = Object.assign(
280+
this._logger.log('access',undefined,response._request,response._request.context),
284281
{ statusCode: res.statusCode, coldStart: response._request.coldStart }
285282
)
286283
console.log(JSON.stringify(this._logger.format(access,response._request,response))) // eslint-disable-line no-console

lib/logger.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
* @license MIT
77
*/
88

9+
// IDEA: request counts
10+
// IDEA: unique function identifier
11+
912
const UTILS = require('./utils') // Require utils library
1013

1114
// Config logger
@@ -54,7 +57,6 @@ exports.config = (config,levels) => {
5457
path: req.path,
5558
ip: req.ip,
5659
ua: req.userAgent,
57-
method: req.method,
5860
version: req.version,
5961
qs: Object.keys(req.query).length > 0 ? req.query : undefined
6062
}
@@ -77,14 +79,15 @@ exports.config = (config,levels) => {
7779
req: cfg.serializers && typeof cfg.serializers.req === 'function' ? cfg.serializers.req : () => {},
7880
res: cfg.serializers && typeof cfg.serializers.res === 'function' ? cfg.serializers.res : () => {},
7981
context: cfg.serializers && typeof cfg.serializers.context === 'function' ? cfg.serializers.context : () => {},
80-
custom: cfg.serializers && typeof cfg.serializers.context === 'function' ? cfg.serializers.context : () => {}
82+
custom: cfg.serializers && typeof cfg.serializers.custom === 'function' ? cfg.serializers.custom : () => {}
8183
}
8284

8385
// Main logging function
8486
let log = (level,msg,req,context,custom) => {
8587

86-
let _context = Object.assign(defaults.context(context),serializers.custom(context))
87-
let _custom = Object.assign(defaults.custom(custom),serializers.custom(custom))
88+
let _context = Object.assign({},defaults.context(context),serializers.context(context))
89+
let _custom = typeof custom === 'string' ? defaults.custom(custom) :
90+
Object.assign({},defaults.custom(custom),serializers.custom(custom))
8891

8992
return Object.assign({},
9093
{
@@ -101,13 +104,14 @@ exports.config = (config,levels) => {
101104
nested ? { [customKey]: _custom } : _custom,
102105
nested ? { context: _context } : _context
103106
)
104-
}
107+
108+
} // end log
105109

106110
// Formatting function for additional log data enrichment
107111
let format = function(info,req,res) {
108112

109-
let _req = Object.assign(defaults.req(req),serializers.req(req))
110-
let _res = Object.assign(defaults.res(res),serializers.res(res))
113+
let _req = Object.assign({},defaults.req(req),serializers.req(req))
114+
let _res = Object.assign({},defaults.res(res),serializers.res(res))
111115

112116
return Object.assign({},
113117
info,

0 commit comments

Comments
 (0)