Merge pull request #21 from jimmiehansson/bugfix/ISSUE-19-empty-value…

…-time

ISSUE-19 Check value before setting date object

pino-elasticsearch.js

@@ -22,12 +22,18 @@ function pinoElasticSearch (opts) {
     if (typeof value === 'string') {
       value = {
         data: value,
-        time: (new Date()).toISOString()
+        time: setDateTimeString(value)
       }
     } else {
-      value.time = (new Date(value.time)).toISOString()
+      value.time = setDateTimeString(value)
     }
 
+    function setDateTimeString (value) {
+      if (typeof value === 'object' && value.hasOwnProperty('time')) {
+        return (value.time.length > 0) ? new Date(value.time).toISOString() : new Date().toISOString()
+      }
+      return new Date().toISOString()
+    }
     return value
   })
   const client = new elasticsearch.Client({

test/fixtures.js

@@ -0,0 +1,8 @@
+'use strict'
+const ctx = module.exports
+
+ctx.datetime = {
+  object: new Date('2018-10-22T18:09:48.110Z').toISOString(),
+  string: '2018-10-22T18:09:48.110Z'
+}
+module.exports = ctx

test/unit.test.js

@@ -1,24 +1,33 @@
 'use strict'
 
 const pino = require('pino')
-
 const proxyquire = require('proxyquire')
-
 const test = require('tap').test
+const fix = require('./fixtures')
+
+const matchISOString = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/
 const options = {
   index: 'pinotest',
   type: 'log',
   consistency: 'one',
   host: 'localhost',
   port: 9200
 }
+
+test('make sure date format is valid', (t) => {
+  t.type(fix.datetime.object, 'string')
+  t.equal(fix.datetime.object, fix.datetime.string)
+  t.end()
+})
 test('make sure log is a valid json', (t) => {
-  t.plan(2)
+  t.plan(4)
   const Client = function (config) {
     t.equal(config.host, `${options.host}:${options.port}`)
   }
   Client.prototype.index = (obj, cb) => {
     t.ok(obj, true)
+    t.type(obj.body.time, 'string')
+    t.match(obj.body.time, matchISOString)
     cb(null, {})
   }
   const elastic = proxyquire('../', {