Merge branch 'master' into v17

README.md

@@ -50,10 +50,7 @@ server.register(require('hapi-pino'), (err) => {
     process.exit(1)
   }
 
-  // the logger is available in server.app
-  server.app.logger.warn('Pino is registered')
-
-  // also as a decorated API
+  // The logger is available as a decorated API
   server.logger().info('another way for accessing it')
 
   // and through Hapi standard logging system
@@ -143,7 +140,7 @@ server.log(['info'], {hello: 'world'})
 * `'log'`, to support logging via the Hapi `server.log()` and
   `request.log()` methods, see `tags` and `allTags` options.
 * `'onPostStart'`, to log when the server is started
-* `'onPostStopt'`, to log when the server is stopped
+* `'onPostStop'`, to log when the server is stopped
 
 ## Acknowledgements
 

index.js

@@ -48,9 +48,6 @@ async function register (server, options, nex) {
 
   const mergeHapiLogData = options.mergeHapiLogData
 
-  // expose logger as 'server.app.logger'
-  server.app.logger = logger
-
   // expose logger as 'server.logger()'
   server.decorate('server', 'logger', () => logger)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hapi-pino",
-  "version": "1.7.0",
+  "version": "2.0.0",
   "description": "Hapi plugin for the Pino logger ",
   "main": "index.js",
   "scripts": {

test.js

@@ -82,12 +82,10 @@ function ltest (func) {
   })
 }
 
-experiment('logs through the server.app.logger', () => {
-  ltest(async (level) => {
-    const server = getServer()
-    await registerWithSink(server, level, onHelloWorld)
-    server.app.logger[level]('hello world')
-  })
+test('server.app.logger is undefined', async () => {
+  const server = getServer()
+  await registerWithSink(server, 'info', () => { throw new Error('fail') })
+  expect(server.app.logger).to.be.undefined()
 })
 
 experiment('logs through the server.logger()', () => {
@@ -555,7 +553,7 @@ experiment('uses a prior pino instance', () => {
     }
 
     server.register(plugin).then(() => {
-      server.app.logger.info({foo: 'bar'}, 'hello world')
+      server.logger().info({foo: 'bar'}, 'hello world')
     }).catch(done)
   })
 })