Merge branch 'jedrus2000-master'

felixheck · Oct 22, 2020 · a049e66 · a049e66
2 parents 39b8d0e + fa873e1
commit a049e66
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -1,4 +1,5 @@
 const errorStackParser = require('error-stack-parser')
+const util = require('util')
 
 /**
  * @function
@@ -56,7 +57,7 @@ function noop (data) {
  * @param {Array} data The data to be logged
  */
 function wrapper (server, level, ...data) {
-  server.log(level, data.length === 1 ? data[0] : data)
+  server.log(level, util.format(data))
 }
 
 /**

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -471,7 +471,7 @@ test.serial.cb('get log message by overriden `console.warn` – single', (t) =>
   const logs = ['foobar']
 
   helpers.spawn('console', options, logs, (log) => {
-    t.is(log.message, 'foobar')
+    t.is(log.message, '[ \'foobar\' ]')
     t.end()
   })
 })
@@ -486,7 +486,22 @@ test.serial.cb('get log message by overriden `console.warn` – multiple', (t)
   const logs = ['foo', 'bar']
 
   helpers.spawn('console', options, logs, (log) => {
-    t.deepEqual(log.message, ['foo', 'bar'])
+    t.deepEqual(log.message, '[ \'foo\', \'bar\' ]')
+    t.end()
+  })
+})
+
+test.serial.cb('get log message by overriden `console.warn` – null', (t) => {
+  const options = {
+    indent: 0,
+    override: true,
+    hapiPino: { logEvents: false }
+  }
+
+  const logs = [null]
+
+  helpers.spawn('console', options, logs, (log) => {
+    t.is(log.message, '[ null ]')
     t.end()
   })
 })

diff --git a/test/tokens.spec.js b/test/tokens.spec.js
@@ -122,11 +122,15 @@ test('return requested req/res attributes', (t) => {
     }
   }
 
+  const mockDataWithNullReq = Object.assign({}, mockData)
+  mockDataWithNullReq.req = null
+
   t.is(tokens.requestId(mockData), mockData.req.id)
   t.is(tokens.method(mockData, mockColors), mockData.req.method.toUpperCase())
   t.is(tokens.status(mockData, mockColors), mockData.res.statusCode)
   t.is(tokens.payload(mockData), JSON.stringify({}))
   t.is(tokens.remoteAddress(mockData), mockData.req.remoteAddress)
+  t.is(tokens.remoteAddress(mockDataWithNullReq), undefined)
   t.is(tokens.remotePort(mockData), mockData.req.remotePort)
   t.is(tokens.url(mockData), mockData.req.url.href)
   t.is(tokens.req(mockData, mockColors, 'x-header'), mockData.req.headers['x-header'])