From f14c8ab0c6d7f383fd13774c2d4760650c73228e Mon Sep 17 00:00:00 2001
From: Kulshekhar Kabra <kulshekhar@users.noreply.github.com>
Date: Sun, 30 Oct 2016 13:01:41 +0530
Subject: [PATCH 1/2] Close all alive connections on SIGINT/SIGTERM

---
 src/cli/parse-server.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/cli/parse-server.js b/src/cli/parse-server.js
index 028afdd7c6..f18605a672 100755
--- a/src/cli/parse-server.js
+++ b/src/cli/parse-server.js
@@ -31,9 +31,13 @@ const help = function(){
 function startServer(options, callback) {
   const app = express();
   const api = new ParseServer(options);
+  const sockets = {}
+
   app.use(options.mountPath, api);
 
   var server = app.listen(options.port, callback);
+  server.on('connection', initializeConnections);
+
   if (options.startLiveQueryServer || options.liveQueryServerOptions) {
     let liveQueryServer = server;
     if (options.liveQueryPort) {
@@ -43,8 +47,27 @@ function startServer(options, callback) {
     }
     ParseServer.createLiveQueryServer(liveQueryServer, options.liveQueryServerOptions);
   }
+
+  function initializeConnections(socket) {
+    const socketId = socket.remoteAddress + ':' + socket.remotePort
+    sockets[socketId] = socket;
+
+    socket.on('close', () => {
+      delete sockets[socketId];
+    });
+  }
+
+  function destroyAliveConnections() {
+    for (const socketId in sockets) {
+      try {
+        sockets[socketId].destroy()
+      } catch (e) { }
+    }
+  }
+
   var handleShutdown = function() {
     console.log('Termination signal received. Shutting down.');
+    destroyAliveConnections();
     server.close(function () {
       process.exit(0);
     });

From b5c14a8155712d07b9d18839b0c1ef6c85ce88db Mon Sep 17 00:00:00 2001
From: Kulshekhar Kabra <kulshekhar@users.noreply.github.com>
Date: Sun, 30 Oct 2016 20:17:03 +0530
Subject: [PATCH 2/2] Add a comment referencing the node issue.

---
 src/cli/parse-server.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/cli/parse-server.js b/src/cli/parse-server.js
index f18605a672..78b6995bb6 100755
--- a/src/cli/parse-server.js
+++ b/src/cli/parse-server.js
@@ -31,7 +31,7 @@ const help = function(){
 function startServer(options, callback) {
   const app = express();
   const api = new ParseServer(options);
-  const sockets = {}
+  const sockets = {};
 
   app.use(options.mountPath, api);
 
@@ -49,7 +49,11 @@ function startServer(options, callback) {
   }
 
   function initializeConnections(socket) {
-    const socketId = socket.remoteAddress + ':' + socket.remotePort
+    /* Currently, express doesn't shut down immediately after receiving SIGINT/SIGTERM if it has client connections that haven't timed out. (This is a known issue with node - https://github.com/nodejs/node/issues/2642)
+
+      This function, along with `destroyAliveConnections()`, intend to fix this behavior such that parse server will close all open connections and initiate the shutdown process as soon as it receives a SIGINT/SIGTERM signal. */
+
+    const socketId = socket.remoteAddress + ':' + socket.remotePort;
     sockets[socketId] = socket;
 
     socket.on('close', () => {
@@ -60,7 +64,7 @@ function startServer(options, callback) {
   function destroyAliveConnections() {
     for (const socketId in sockets) {
       try {
-        sockets[socketId].destroy()
+        sockets[socketId].destroy();
       } catch (e) { }
     }
   }