Merge remote-tracking branch 'origin/ihavener-deprecate-socketio-clie…

…nts'

CHANGELOG.md

@@ -1,3 +1,8 @@
+0.4.0 / 2017-03-19
+==================
+
+  * Support disconnect for more socket.io versions
+
 0.3.2 / 2016-08/05
 ==================
 

lib/graceful-exit.js

@@ -80,10 +80,29 @@ exports.gracefulExitHandler = function(app, server, _options) {
 
   // Disconnect all the socket.io clients
   if (options.socketio) {
-    options.socketio.sockets.clients().forEach(function(socket) {
-      logger('Killing socketio socket');
-      socket.disconnect();
-    });
+    var sockets = options.socketio.sockets;
+    var connectedSockets;
+    if (typeof sockets.sockets === 'object' && !Array.isArray(sockets.sockets)) {
+      // socket.io 1.4+
+      connectedSockets = _.values(sockets.sockets);
+    }
+    else if (sockets.sockets && sockets.sockets.length) {
+      // socket.io 1.0-1.3
+      connectedSockets = sockets.sockets;
+    }
+    else if (typeof sockets.clients === 'function') {
+      // socket.io 0.x
+      connectedSockets = sockets.clients();
+    }
+    if (typeof options.socketio.close === 'function') {
+      options.socketio.close();
+    }
+    if (connectedSockets && connectedSockets.length) {
+      logger('Killing ' + connectedSockets.length + ' socket.io sockets');
+      connectedSockets.forEach(function(socket) {
+        socket.disconnect();
+      });
+    }
   }
 
   // If after an acceptable time limit is reached and we still have some

package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-graceful-exit",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "description": "Allow graceful exits for express apps, supporting zero downtime deploys",
   "keywords": [
     "express",