happn-logger
Advanced tools
Comparing version 1.0.0-prerelease-1 to 1.0.0-prerelease-2
@@ -187,6 +187,7 @@ var util = require('util'); | ||
function tryStringify(obj, level) { | ||
function tryStringify(obj, level, tag) { | ||
const toStringify = { | ||
timestamp: Date.now(), | ||
level | ||
level, | ||
tag : tag ? tag.toString() : undefined | ||
}; | ||
@@ -210,4 +211,4 @@ let data; | ||
Config.$$RAW = function(obj, level = 'info') { | ||
Config.rawLogWriter[level](tryStringify(obj, level)); | ||
Config.$$RAW = function(obj, level = 'info', tag) { | ||
Config.rawLogWriter[level](tryStringify(obj, level, tag)); | ||
} | ||
@@ -339,32 +340,32 @@ | ||
logger.raw = { | ||
fatal: (obj) => { | ||
logger.json = { | ||
fatal: (obj, tag) => { | ||
if (!Config.logWriter) return; | ||
if (!Config.logWriter.isFatalEnabled()) return; | ||
Config.$$RAW(obj, 'fatal'); | ||
Config.$$RAW(obj, 'fatal', tag); | ||
}, | ||
error: (obj) => { | ||
error: (obj, tag) => { | ||
if (!Config.logWriter) return; | ||
if (!Config.logWriter.isErrorEnabled()) return; | ||
Config.$$RAW(obj, 'error'); | ||
Config.$$RAW(obj, 'error', tag); | ||
}, | ||
info: (obj) => { | ||
info: (obj, tag) => { | ||
if (!Config.logWriter) return; | ||
if (!Config.logWriter.isInfoEnabled()) return; | ||
Config.$$RAW(obj, 'info'); | ||
Config.$$RAW(obj, 'info', tag); | ||
}, | ||
debug: (obj) => { | ||
debug: (obj, tag) => { | ||
if (!Config.logWriter) return; | ||
if (!Config.logWriter.isDebugEnabled()) return; | ||
Config.$$RAW(obj, 'debug'); | ||
Config.$$RAW(obj, 'debug', tag); | ||
}, | ||
warn: (obj) => { | ||
warn: (obj, tag) => { | ||
if (!Config.logWriter) return; | ||
if (!Config.logWriter.isWarnEnabled()) return; | ||
Config.$$RAW(obj, 'warn'); | ||
Config.$$RAW(obj, 'warn', tag); | ||
}, | ||
trace: (obj) => { | ||
trace: (obj, tag) => { | ||
if (!Config.logWriter) return; | ||
if (!Config.logWriter.isTraceEnabled()) return; | ||
Config.$$RAW(obj, 'trace'); | ||
Config.$$RAW(obj, 'trace', tag); | ||
} | ||
@@ -371,0 +372,0 @@ } |
{ | ||
"name": "happn-logger", | ||
"version": "1.0.0-prerelease-1", | ||
"version": "1.0.0-prerelease-2", | ||
"description": "Logger using log4js", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -553,32 +553,32 @@ var should = require('chai').should(); | ||
var log = Logger.createLogger(); | ||
log.raw.fatal .should.be.an.instanceof(Function); | ||
log.raw.error .should.be.an.instanceof(Function); | ||
log.raw.warn .should.be.an.instanceof(Function); | ||
log.raw.info .should.be.an.instanceof(Function); | ||
log.raw.debug .should.be.an.instanceof(Function); | ||
log.raw.trace .should.be.an.instanceof(Function); | ||
log.json.fatal .should.be.an.instanceof(Function); | ||
log.json.error .should.be.an.instanceof(Function); | ||
log.json.warn .should.be.an.instanceof(Function); | ||
log.json.info .should.be.an.instanceof(Function); | ||
log.json.debug .should.be.an.instanceof(Function); | ||
log.json.trace .should.be.an.instanceof(Function); | ||
}); | ||
it('calls the log raw function - fatal', function(done) { | ||
testLogWriterRaw('fatal', { test: 'data'}, done); | ||
testLogWriterRaw('fatal', { test: 'data'}, 'tag-1', done); | ||
}); | ||
it('calls the log raw function - info', function(done) { | ||
testLogWriterRaw('info', { test: 'data'}, done); | ||
testLogWriterRaw('info', { test: 'data'}, 'tag-2', done); | ||
}); | ||
it('calls the log raw function - error', function(done) { | ||
testLogWriterRaw('error', { test: 'data'}, done); | ||
testLogWriterRaw('error', { test: 'data'}, 'tag-3', done); | ||
}); | ||
it('calls the log raw function - debug', function(done) { | ||
testLogWriterRaw('debug', { test: 'data'}, done); | ||
testLogWriterRaw('debug', { test: 'data'}, 'tag-4', done); | ||
}); | ||
it('calls the log raw function - warn', function(done) { | ||
testLogWriterRaw('warn', { test: 'data'}, done); | ||
testLogWriterRaw('warn', { test: 'data'}, 'tag-5', done); | ||
}); | ||
it('calls the log raw function - trace', function(done) { | ||
testLogWriterRaw('trace', { test: 'data'}, done); | ||
testLogWriterRaw('trace', { test: 'data'}, 'tag-6', done); | ||
}); | ||
@@ -592,8 +592,8 @@ | ||
captureStdout.startCapture(); | ||
log.raw['fatal']({ test: 'fatal' }); | ||
log.raw['info']({ test: 'info' }); | ||
log.raw['error']({ test: 'error' }); | ||
log.raw['debug']({ test: 'debug' }); | ||
log.raw['warn']({ test: 'warn' }); | ||
log.raw['trace']({ test: 'trace' }); | ||
log.json['fatal']({ test: 'fatal' }); | ||
log.json['info']({ test: 'info' }); | ||
log.json['error']({ test: 'error' }); | ||
log.json['debug']({ test: 'debug' }); | ||
log.json['warn']({ test: 'warn' }); | ||
log.json['trace']({ test: 'trace' }); | ||
captureStdout.stopCapture(); | ||
@@ -608,8 +608,8 @@ const arrJson = captureStdout | ||
arrJson.should.eql([ | ||
{"level":"fatal","data":{"test":"fatal"}}, | ||
{"level":"info","data":{"test":"info"}}, | ||
{"level":"error","data":{"test":"error"}}, | ||
{"level":"debug","data":{"test":"debug"}}, | ||
{"level":"warn","data":{"test":"warn"}}, | ||
{"level":"trace","data":{"test":"trace"}} | ||
{"level":"fatal", "data":{"test":"fatal"}}, | ||
{"level":"info", "data":{"test":"info"}}, | ||
{"level":"error", "data":{"test":"error"}}, | ||
{"level":"debug", "data":{"test":"debug"}}, | ||
{"level":"warn", "data":{"test":"warn"}}, | ||
{"level":"trace", "data":{"test":"trace"}} | ||
]); | ||
@@ -624,10 +624,10 @@ }); | ||
captureStdout.startCapture(); | ||
log.raw['fatal'](new Error('a fatal error!')); | ||
log.raw['info'](null); | ||
log.raw['error'](undefined); | ||
log.raw['debug'](12345); | ||
log.raw['warn']('warning!'); | ||
log.json['fatal'](new Error('a fatal error!')); | ||
log.json['info'](null); | ||
log.json['error'](undefined); | ||
log.json['debug'](12345); | ||
log.json['warn']('warning!'); | ||
const circularObj = {}; | ||
circularObj.me = circularObj; | ||
log.raw['trace'](circularObj); | ||
log.json['trace'](circularObj); | ||
captureStdout.stopCapture(); | ||
@@ -651,3 +651,3 @@ const arrJson = captureStdout | ||
function testLogWriterRaw(level, obj, done){ | ||
function testLogWriterRaw(level, obj, tag, done){ | ||
Logger.configure({logLevel: 'trace'}); | ||
@@ -661,9 +661,10 @@ log = Logger.createLogger(); | ||
data: obj, | ||
level | ||
level, | ||
tag | ||
}); | ||
done(); | ||
} | ||
log.raw[level](obj); | ||
log.json[level](obj, tag); | ||
} | ||
}); | ||
}); |
41338
951