|
|
@@ -25,6 +25,7 @@ var os = require('os'); |
|
|
var fs = require('fs');
|
|
|
var util = require('util');
|
|
|
var assert = require('assert');
|
|
|
var dtrace = require('dtrace-provider');
|
|
|
var EventEmitter = require('events').EventEmitter;
|
|
|
|
|
|
|
|
|
@@ -156,6 +157,8 @@ var levelFromName = { |
|
|
'fatal': FATAL
|
|
|
};
|
|
|
|
|
|
var dtp = undefined;
|
|
|
var probes = {};
|
|
|
|
|
|
/**
|
|
|
* Resolve a level number, name (upper or lowercase) to a level number value.
|
|
|
@@ -299,6 +302,22 @@ function Logger(options, _childOptions, _childSimple) { |
|
|
this.fields = {};
|
|
|
}
|
|
|
|
|
|
if (!dtp) {
|
|
|
dtp = dtrace.createDTraceProvider('bunyan');
|
|
|
|
|
|
for (var level in levelFromName) {
|
|
|
var probe;
|
|
|
|
|
|
probes[levelFromName[level]] = probe =
|
|
|
dtp.addProbe('log-' + level, 'char *');
|
|
|
|
|
|
// Explicitly add a reference to dtp to prevent it from being GC'd
|
|
|
probe.dtp = dtp;
|
|
|
}
|
|
|
|
|
|
dtp.enable();
|
|
|
}
|
|
|
|
|
|
// Helpers
|
|
|
function addStream(s) {
|
|
|
s = objCopy(s);
|
|
|
@@ -641,8 +660,9 @@ Logger.prototype._mkRecord = function (fields, level, msgArgs) { |
|
|
* Emit a log record.
|
|
|
*
|
|
|
* @param rec {log record}
|
|
|
* @param noemit {Boolean} Optional. Set to true to only return the string.
|
|
|
*/
|
|
|
Logger.prototype._emit = function (rec) {
|
|
|
Logger.prototype._emit = function (rec, noemit) {
|
|
|
var i;
|
|
|
|
|
|
var obj = objCopy(rec[0]);
|
|
|
@@ -685,6 +705,9 @@ Logger.prototype._emit = function (rec) { |
|
|
str = JSON.stringify(obj, safeCycles()) + '\n';
|
|
|
}
|
|
|
|
|
|
if (noemit)
|
|
|
return str;
|
|
|
|
|
|
for (i = 0; i < this.streams.length; i++) {
|
|
|
var s = this.streams[i];
|
|
|
if (s.level <= level) {
|
|
|
@@ -693,6 +716,8 @@ Logger.prototype._emit = function (rec) { |
|
|
s.stream.write(s.raw ? obj : str);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
return str;
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -702,33 +727,50 @@ Logger.prototype._emit = function (rec) { |
|
|
*/
|
|
|
function mkLogEmitter(minLevel) {
|
|
|
return function () {
|
|
|
var log = this;
|
|
|
|
|
|
var mkRecord = function (args) {
|
|
|
if (args[0] instanceof Error) {
|
|
|
// `log.<level>(err, ...)`
|
|
|
fields = {err: errSerializer(args[0])};
|
|
|
if (args.length === 1) {
|
|
|
msgArgs = [fields.err.message];
|
|
|
} else {
|
|
|
msgArgs = Array.prototype.slice.call(args, 1);
|
|
|
}
|
|
|
} else if (typeof (args[0]) === 'string') { // `log.<level>(msg, ...)`
|
|
|
fields = null;
|
|
|
msgArgs = Array.prototype.slice.call(args);
|
|
|
} else if (Buffer.isBuffer(args[0])) { // `log.<level>(buf, ...)`
|
|
|
// Almost certainly an error, show `inspect(buf)`. See bunyan issue #35.
|
|
|
fields = null;
|
|
|
msgArgs = Array.prototype.slice.call(args);
|
|
|
msgArgs[0] = util.inspect(msgArgs[0]);
|
|
|
} else { // `log.<level>(fields, msg, ...)`
|
|
|
fields = args[0];
|
|
|
msgArgs = Array.prototype.slice.call(args, 1);
|
|
|
}
|
|
|
return log._mkRecord(fields, minLevel, msgArgs);
|
|
|
};
|
|
|
|
|
|
var fields = null, msgArgs = null;
|
|
|
if (arguments.length === 0) { // `log.<level>()`
|
|
|
return (this._level <= minLevel);
|
|
|
} else if (this._level > minLevel) {
|
|
|
return;
|
|
|
} else if (arguments[0] instanceof Error) {
|
|
|
// `log.<level>(err, ...)`
|
|
|
fields = {err: errSerializer(arguments[0])};
|
|
|
if (arguments.length === 1) {
|
|
|
msgArgs = [fields.err.message];
|
|
|
} else {
|
|
|
msgArgs = Array.prototype.slice.call(arguments, 1);
|
|
|
}
|
|
|
} else if (typeof (arguments[0]) === 'string') { // `log.<level>(msg, ...)`
|
|
|
fields = null;
|
|
|
msgArgs = Array.prototype.slice.call(arguments);
|
|
|
} else if (Buffer.isBuffer(arguments[0])) { // `log.<level>(buf, ...)`
|
|
|
// Almost certainly an error, show `inspect(buf)`. See bunyan issue #35.
|
|
|
fields = null;
|
|
|
msgArgs = Array.prototype.slice.call(arguments);
|
|
|
msgArgs[0] = util.inspect(msgArgs[0]);
|
|
|
} else { // `log.<level>(fields, msg, ...)`
|
|
|
fields = arguments[0];
|
|
|
msgArgs = Array.prototype.slice.call(arguments, 1);
|
|
|
/*
|
|
|
* Even if our level is such that we will not emit the record, we want
|
|
|
* to fire the DTrace probe associated with the level -- but we only
|
|
|
* assemble the string representation if the probe is in fact enabled.
|
|
|
*/
|
|
|
msgArgs = arguments;
|
|
|
|
|
|
probes[minLevel].fire(function () {
|
|
|
return [ log._emit(mkRecord(msgArgs), true) ];
|
|
|
});
|
|
|
} else {
|
|
|
var str = this._emit(mkRecord(arguments));
|
|
|
probes[minLevel].fire(function () { return [ str ]; });
|
|
|
}
|
|
|
var rec = this._mkRecord(fields, minLevel, msgArgs);
|
|
|
this._emit(rec);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
0 comments on commit
af5a3d4