Merge pull request #1 from fs-opensource/master

Use server.stop() method directly
roylines · Apr 7, 2016 · 46848e2 · 46848e2
2 parents e6f0fbd + 28c473d
commit 46848e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -2,7 +2,7 @@ exports.register = function(server, options, done) {
   process.on('message', function(msg) {
     if (msg === 'shutdown') {
       server.log(['info', 'pm2', 'shutdown'], 'stopping hapi...');
-      server.root.stop(options, function() {
+      server.stop(options, function() {
         server.log(['info', 'pm2', 'shutdown'], 'hapi stopped');
         return process.exit(0);
       });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hapi-graceful-pm2",
-  "version": "1.0.0",
+  "version": "1.0.13",
   "description": "hapi plugin to handle graceful pm2 reloads",
   "main": "index.js",
   "scripts": {

diff --git a/test/index.js b/test/index.js
@@ -15,8 +15,7 @@ lab.experiment("hapi-graceful-pm2", () => {
   lab.beforeEach((done) => {
     sinon.stub(process, 'on').returns();
     sinon.stub(process, 'exit');
-    server.root = {};
-    server.root.stop = sinon.stub();
+    server.stop = sinon.stub();
     server.log = sinon.stub();
 
     return plugin.register(server, options, done);
@@ -41,11 +40,11 @@ lab.experiment("hapi-graceful-pm2", () => {
 
   lab.test("should stop server if shutdown", (done) => {
     server.log.returns();
-    server.root.stop.yields();
+    server.stop.yields();
     process.exit.restore();
     sinon.stub(process, 'exit', function(code) {
       code.should.equal(0);
-      server.root.stop.calledOnce.should.be.true;
+      server.stop.calledOnce.should.be.true;
       return done();
     });