TheThing/node-bunyan-lite
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Wiki Activity

Check body length to prevent empty lines

Browse source
This commit is contained in:
Michael Nisi 2016-02-19 17:56:18 +01:00 committed by Trent Mick
parent f36943bb2d
commit 99f3c47793
3 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/bunyan
View file

@ -972,8 +972,9 @@ function emitRecord(rec, line, opts, stylize) {
function (h) { return h + ': ' + headers[h]; }).join('\n'); function (h) { return h + ': ' + headers[h]; }).join('\n');
} }
if (res.body !== undefined) { if (res.body !== undefined) {
s += '\n\n' + (typeof (res.body) === 'object' var body = (typeof (res.body) === 'object'
? JSON.stringify(res.body, null, 2) : res.body); ? JSON.stringify(res.body, null, 2) : res.body);
if (body.length > 0) { s += '\n\n' + body };
delete res.body; delete res.body;
} else { } else {
s = s.trimRight(); s = s.trimRight();

28
test/cli.test.js
View file

@ -502,3 +502,31 @@ test('client_req extra newlines, client_res={} (pull #252)', function (t) {
t.end(); t.end();
}); });
}); });
test('should only show nonempty response bodies', function (t) {
var expect = [
/* BEGIN JSSTYLED */
'[2016-02-10T07:28:41.419Z] INFO: myservice/123 on example.com: UnauthorizedError',
' HTTP/1.1 401 Unauthorized',
' content-type: text/plain',
' date: Sat, 07 Mar 2015 06:58:43 GMT',
'[2016-02-10T07:28:41.419Z] INFO: myservice/123 on example.com: hello',
' HTTP/1.1 200 OK',
' content-type: text/plain',
' content-length: 0',
' date: Sat, 07 Mar 2015 06:58:43 GMT',
' ',
' hello',
'[2016-02-10T07:28:41.419Z] INFO: myservice/123 on example.com: UnauthorizedError',
' HTTP/1.1 401 Unauthorized',
' content-type: text/plain',
' date: Sat, 07 Mar 2015 06:58:43 GMT'
/* END JSSTYLED */
].join('\n') + '\n';
exec(_('%s %s/corpus/content-length-0-res.log', BUNYAN, __dirname),
function (err, stdout, stderr) {
t.ifError(err);
t.equal(stdout, expect);
t.end();
});
});

3
test/corpus/content-length-0-res.log Normal file
View file

@ -0,0 +1,3 @@
{"name":"myservice","hostname":"example.com","pid":123,"level":30,"client_res":{"statusCode":401,"headers":{"content-type":"text/plain","date":"Sat, 07 Mar 2015 06:58:43 GMT"},"body":""},"msg":"UnauthorizedError","time":"2016-02-10T07:28:41.419Z","v":0}
{"name":"myservice","hostname":"example.com","pid":123,"level":30,"client_res":{"statusCode":200,"headers":{"content-type":"text/plain","content-length":0,"date":"Sat, 07 Mar 2015 06:58:43 GMT"},"body":"hello"},"msg":"hello","time":"2016-02-10T07:28:41.419Z","v":0}
{"name":"myservice","hostname":"example.com","pid":123,"level":30,"client_res":{"statusCode":401,"headers":{"content-type":"text/plain","date":"Sat, 07 Mar 2015 06:58:43 GMT"}},"msg":"UnauthorizedError","time":"2016-02-10T07:28:41.419Z","v":0}