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

v1.8.4; fix 'src' usage with node v7

Browse source 
Fixes #454
This commit is contained in:
Trent Mick 2016-10-25 11:22:43 -07:00
parent e0f0a5d6fa
commit c04e84313f
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -8,6 +8,11 @@ Known issues:
## not yet released ## not yet released
## 1.8.4
- [issue #454] Fix `src` usage with node v7.
## 1.8.3 ## 1.8.3
- [issue #450] Fix `log.info(null)` crash that resulted from #426 in v1.8.2. - [issue #450] Fix `log.info(null)` crash that resulted from #426 in v1.8.2.

7
Makefile
View file

@ -105,8 +105,13 @@ test: $(NODEUNIT)
# Note: 'test4' is last so (if all is well) I end up with a binary # Note: 'test4' is last so (if all is well) I end up with a binary
# dtrace-provider build for my current default node version. # dtrace-provider build for my current default node version.
.PHONY: testall .PHONY: testall
testall: test6 test012 test010 test4 testall: test7 test6 test012 test010 test4
.PHONY: test7
test7:
@echo "# Test node 7.x (with node `$(NODEOPT)/node-7/bin/node --version`)"
@$(NODEOPT)/node-7/bin/node --version | grep '^v7\.'
PATH="$(NODEOPT)/node-7/bin:$(PATH)" make distclean all test
.PHONY: test6 .PHONY: test6
test6: test6:
@echo "# Test node 6.x (with node `$(NODEOPT)/node-6/bin/node --version`)" @echo "# Test node 6.x (with node `$(NODEOPT)/node-6/bin/node --version`)"

6
bin/bunyan
View file

@ -1,7 +1,7 @@
#!/usr/bin/env node #!/usr/bin/env node
/** /**
* Copyright 2016 Trent Mick. All rights reserved. * Copyright 2016 Trent Mick
* Copyright 2016 Joyent Inc. All rights reserved. * Copyright 2016 Joyent Inc.
* *
* bunyan -- filter and pretty-print Bunyan log files (line-delimited JSON) * bunyan -- filter and pretty-print Bunyan log files (line-delimited JSON)
* *
@ -11,7 +11,7 @@
* vim: expandtab:ts=4:sw=4 * vim: expandtab:ts=4:sw=4
*/ */
var VERSION = '1.8.3'; var VERSION = '1.8.4';
var p = console.log; var p = console.log;
var util = require('util'); var util = require('util');

5
lib/bunyan.js
View file

@ -8,7 +8,7 @@
* vim: expandtab:ts=4:sw=4 * vim: expandtab:ts=4:sw=4
*/ */
var VERSION = '1.8.3'; var VERSION = '1.8.4';
/* /*
* Bunyan log format version. This becomes the 'v' field on all log records. * Bunyan log format version. This becomes the 'v' field on all log records.
@ -186,7 +186,6 @@ function getCaller3Info() {
var saveLimit = Error.stackTraceLimit; var saveLimit = Error.stackTraceLimit;
var savePrepare = Error.prepareStackTrace; var savePrepare = Error.prepareStackTrace;
Error.stackTraceLimit = 3; Error.stackTraceLimit = 3;
Error.captureStackTrace(this, getCaller3Info);
Error.prepareStackTrace = function (_, stack) { Error.prepareStackTrace = function (_, stack) {
var caller = stack[2]; var caller = stack[2];
@ -199,7 +198,9 @@ function getCaller3Info() {
if (func) if (func)
obj.func = func; obj.func = func;
}; };
Error.captureStackTrace(this, getCaller3Info);
this.stack; this.stack;
Error.stackTraceLimit = saveLimit; Error.stackTraceLimit = saveLimit;
Error.prepareStackTrace = savePrepare; Error.prepareStackTrace = savePrepare;
return obj; return obj;

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "bunyan", "name": "bunyan",
"version": "1.8.3", "version": "1.8.4",
"description": "a JSON logging library for node.js services", "description": "a JSON logging library for node.js services",
"author": "Trent Mick <trentm@gmail.com> (http://trentm.com)", "author": "Trent Mick <trentm@gmail.com> (http://trentm.com)",
"main": "./lib/bunyan.js", "main": "./lib/bunyan.js",