Merge branch 'master' into issue-167

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pino",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "super fast, all natural json logger",
   "main": "pino.js",
   "browser": "./browser.js",

pino.js

@@ -240,7 +240,7 @@ Pino.prototype.asJson = function asJson (obj, msg, num) {
   // to catch both null and undefined
   /* eslint-disable eqeqeq */
   if (msg != undefined) {
-    data += ',"msg":' + JSON.stringify(msg)
+    data += ',"msg":' + JSON.stringify('' + msg)
   }
   var value
   if (obj) {

pretty.js

@@ -7,6 +7,7 @@ var Parse = require('fast-json-parse')
 var chalk = require('chalk')
 
 var levels = {
+  default: 'USERLVL',
   60: 'FATAL',
   50: 'ERROR',
   40: 'WARN',
@@ -70,6 +71,7 @@ function pretty (opts) {
     })
 
     levelColors = {
+      default: ctx.white,
       60: ctx.bgRed,
       50: ctx.red,
       40: ctx.yellow,
@@ -128,7 +130,11 @@ function pretty (opts) {
   }
 
   function asColoredLevel (value) {
-    return levelColors[value.level](levels[value.level])
+    if (levelColors.hasOwnProperty(value.level)) {
+      return levelColors[value.level](levels[value.level])
+    } else {
+      return levelColors.default(levels.default)
+    }
   }
 }
 

test/basic.test.js

@@ -342,3 +342,38 @@ test('correctly support node v4+ stderr', function (t) {
 
   instance.fatal('a message')
 })
+
+test('normalize number to string', function (t) {
+  var instance = pino(sink(function (chunk, enc, cb) {
+    delete chunk.time
+    t.deepEqual(chunk, {
+      pid: pid,
+      hostname: hostname,
+      level: 30,
+      msg: '1',
+      v: 1
+    })
+    t.end()
+    cb()
+  }))
+
+  instance.info(1)
+})
+
+test('normalize number to string with an object', function (t) {
+  var instance = pino(sink(function (chunk, enc, cb) {
+    delete chunk.time
+    t.deepEqual(chunk, {
+      pid: pid,
+      hostname: hostname,
+      level: 30,
+      msg: '1',
+      answer: 42,
+      v: 1
+    })
+    t.end()
+    cb()
+  }))
+
+  instance.info({ answer: 42 }, 1)
+})

test/pretty.test.js

@@ -172,3 +172,17 @@ test('handles `true` input', function (t) {
   pretty.write('true')
   pretty.end()
 })
+
+test('accept customLogLevvel', function (t) {
+  t.plan(1)
+  var pretty = pino.pretty()
+
+  pretty.pipe(split(function (line) {
+    t.ok(line.indexOf('USERLVL') > 0, 'include custom level')
+    return line
+  }))
+
+  var instance = pino({level: 'testCustom', levelVal: 35}, pretty)
+
+  instance.testCustom('test message')
+})