Merge pull request #15 from mcollina/better-serialization

better serialization

benchmarks/multiArg.js

@@ -73,6 +73,12 @@ var run = bench([
     }
     setImmediate(cb)
   },
+  function benchPinoInterpolate (cb) {
+    for (var i = 0; i < max; i++) {
+      plog.info('hello %s', 'world')
+    }
+    setImmediate(cb)
+  },
   function benchBunyanInterpolateAll (cb) {
     for (var i = 0; i < max; i++) {
       blog.info('hello %s %j %d', 'world', {obj: true}, 4)

package.json

@@ -39,9 +39,8 @@
   "dependencies": {
     "chalk": "^1.1.1",
     "core-util-is": "^1.0.2",
-    "fast-json-parse": "^1.0.0",
-    "json-stringify-safe": "^5.0.1",
-    "quick-format": "^1.0.0",
+    "fast-safe-stringify": "^1.0.4",
+    "quick-format": "^2.0.0",
     "split2": "^2.0.1"
   }
 }

pino.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var stringifySafe = require('json-stringify-safe')
+var stringifySafe = require('fast-safe-stringify')
 var format = require('quick-format')
 var os = require('os')
 var pid = process.pid
@@ -23,7 +23,8 @@ function pino (opts, stream) {
   stream = stream || process.stdout
   opts = opts || {}
   var slowtime = opts.slowtime
-  var stringify = opts.safe !== false ? stringifySafe : JSON.stringify
+  var safe = opts.safe !== false
+  var stringify = safe ? stringifySafe : JSON.stringify
   var name = opts.name
   var level = opts.level
   var funcs = {}
@@ -80,7 +81,7 @@ function pino (opts, stream) {
       }
       len = params.length = arguments.length - base
       if (len > 1) {
-        msg = format(params)
+        msg = format(params, safe ? null : {lowres: true})
       } else if (len) {
         msg = params[0]
       }
@@ -120,7 +121,7 @@ function pino (opts, stream) {
       '"level":' + level + ',' +
       (msg === undefined ? '' : '"msg":"' + (msg && msg.toString()) + '",') +
       '"time":' + (slowtime ? '"' + (new Date()).toISOString() + '"' : Date.now()) + ',' +
-      '"v":' + 0
+      '"v":' + 1
   }
 }
 

test.js

@@ -23,7 +23,7 @@ function check (t, chunk, level, msg) {
     hostname: hostname,
     level: level,
     msg: msg,
-    v: 0
+    v: 1
   })
 }
 
@@ -48,7 +48,7 @@ function levelTest (name, level) {
         hostname: hostname,
         level: level,
         hello: 'world',
-        v: 0
+        v: 1
       })
     }))
 
@@ -67,7 +67,7 @@ function levelTest (name, level) {
         level: level,
         msg: 'a string',
         hello: 'world',
-        v: 0
+        v: 1
       })
     }))
 
@@ -98,7 +98,7 @@ function levelTest (name, level) {
         type: 'Error',
         msg: err.message,
         stack: err.stack,
-        v: 0
+        v: 1
       })
       cb()
     }))
@@ -118,7 +118,7 @@ function levelTest (name, level) {
         level: level,
         msg: 'hello world',
         hello: 'world',
-        v: 0
+        v: 1
       })
     }))
 
@@ -202,7 +202,7 @@ test('set the name', function (t) {
       level: 60,
       name: 'hello',
       msg: 'this is fatal',
-      v: 0
+      v: 1
     })
     cb()
   }))
@@ -241,7 +241,7 @@ test('set undefined properties', function (t) {
       hostname: hostname,
       level: 30,
       hello: 'world',
-      v: 0
+      v: 1
     })
     cb()
   }))
@@ -260,7 +260,7 @@ test('set properties defined in the prototype chain', function (t) {
       hostname: hostname,
       level: 30,
       hello: 'world',
-      v: 0
+      v: 1
     })
     cb()
   }))
@@ -286,7 +286,7 @@ test('http request support', function (t) {
       hostname: hostname,
       level: 30,
       msg: 'my request',
-      v: 0,
+      v: 1,
       req: {
         method: originalReq.method,
         url: originalReq.url,
@@ -328,7 +328,7 @@ test('http request support via serializer', function (t) {
       hostname: hostname,
       level: 30,
       msg: 'my request',
-      v: 0,
+      v: 1,
       req: {
         method: originalReq.method,
         url: originalReq.url,
@@ -366,7 +366,7 @@ test('http response support', function (t) {
       hostname: hostname,
       level: 30,
       msg: 'my response',
-      v: 0,
+      v: 1,
       res: {
         statusCode: originalRes.statusCode,
         header: originalRes._header
@@ -405,7 +405,7 @@ test('http response support via a serializer', function (t) {
       hostname: hostname,
       level: 30,
       msg: 'my response',
-      v: 0,
+      v: 1,
       res: {
         statusCode: originalRes.statusCode,
         header: originalRes._header
@@ -454,7 +454,7 @@ test('http request support via serializer in a child', function (t) {
       hostname: hostname,
       level: 30,
       msg: 'my request',
-      v: 0,
+      v: 1,
       req: {
         method: originalReq.method,
         url: originalReq.url,