Update dependencies

kanongil · Dec 31, 2018 · 29b7fd9 · 29b7fd9
1 parent cfd143a
commit 29b7fd9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015 - 2017, Gil Pedersen <gpdev@gpost.dk>
+Copyright (c) 2015 - 2019, Gil Pedersen <gpdev@gpost.dk>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

diff --git a/lib/index.js b/lib/index.js
@@ -267,6 +267,7 @@ exports.Manager = class {
                 if (startError) {
                     throw new Error('Start aborted');
                 }
+
                 active.push(server);
             }
             catch (err) {
@@ -334,9 +335,11 @@ exports.reset = function () {
     if (internals.processExit) {
         internals.teardownExitHooks();
     }
+
     if (internals.manager) {
         clearTimeout(internals.manager.exitTimer);
     }
+
     internals.manager = null;
 };
 

diff --git a/package.json b/package.json
@@ -12,11 +12,11 @@
   "devDependencies": {
     "code": "^5.1.0",
     "hapi": "^17.0.0",
-    "lab": "^15.0.0"
+    "lab": "^18.0.1"
   },
   "dependencies": {
     "bounce": "^1.2.0",
-    "hoek": "^5.0.0"
+    "hoek": "^6.1.2"
   },
   "peerDependencies": {
     "hapi": ">=17.0.0"

diff --git a/test/exiting.js b/test/exiting.js
@@ -56,16 +56,25 @@ describe('Manager', () => {
         return promise;
     };
 
+    const ignoreProcessExitError = (err) => {
+
+        if (err instanceof Exiting.ProcessExitError) {
+            return;
+        }
+
+        throw err;
+    };
+
     lab.before(() => {
 
         // Silence log messages
 
         const log = Exiting.log;
-        Exiting.log = function () {
+        Exiting.log = function (...args) {
 
             const consoleError = console.error;
             console.error = Hoek.ignore;
-            log.apply(Exiting, arguments);
+            log.apply(Exiting, args);
             console.error = consoleError;
         };
     });
@@ -228,9 +237,7 @@ describe('Manager', () => {
         exited.exit(0);
     });
 
-    it('uncaughtException handler ignores ProcessExitErrors', async () => {
-
-        process.removeAllListeners('uncaughtException');         // Disable lab integration
+    it('uncaughtException handler ignores ProcessExitErrors', async (flags) => {
 
         const manager = Exiting.createManager([Hapi.Server(), Hapi.Server(), Hapi.Server()]);
         const exited = grabExit(manager, true);
@@ -239,23 +246,30 @@ describe('Manager', () => {
 
         // Immitate a throw by faking an uncaughtException
 
+        flags.onUncaughtException = ignoreProcessExitError;
         process.emit('uncaughtException', new Exiting.ProcessExitError());
 
         const { code, state } = await exited.exit(0);
         expect(state).to.equal('stopped');
         expect(code).to.equal(0);
     });
 
-    it('unhandledRejection handler ignores ProcessExitErrors', async () => {
-
-        process.removeAllListeners('unhandledRejection');        // Disable lab integration
+    it('unhandledRejection handler ignores ProcessExitErrors', async (flags) => {
 
         const manager = Exiting.createManager([Hapi.Server(), Hapi.Server(), Hapi.Server()]);
         const exited = grabExit(manager, true);
 
         await manager.start();
 
-        new Promise((resolve, reject) => reject(new Exiting.ProcessExitError()));
+        await new Promise((resolve, reject) => {
+
+            flags.onUnhandledRejection = (err) => {
+
+                (err instanceof Exiting.ProcessExitError) ? resolve() : reject(err);
+            };
+
+            Promise.reject(new Exiting.ProcessExitError());
+        });
 
         const { code, state } = await exited.exit(0);
         expect(state).to.equal('stopped');