From 60f880ae9d9d8c69b9bf6997713e6f1b6333af33 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Mon, 13 Jun 2016 18:56:18 -0700
Subject: [PATCH] Fix server timeout

---
 modules/server/index.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/server/index.js b/modules/server/index.js
index 2b7a639..e3e7518 100644
--- a/modules/server/index.js
+++ b/modules/server/index.js
@@ -116,14 +116,18 @@ export const startServer = (serverConfig) => {
     ? createServer(config)
     : createDevServer(config)
 
+  let httpServer = server.listen(config.port, () => {
+    console.log('Server #%s listening on port %s, Ctrl+C to stop', config.id, config.port)
+  })
+
+  if (httpServer == null)
+    httpServer = server.listeningApp
+
   // Max request timeout on Heroku is 30s, so set our
   // timeout to 20s to make sure we don't hang.
   // https://devcenter.heroku.com/articles/request-timeout
-  server.timeout = 20000
-
-  server.listen(config.port, () => {
-    console.log('Server #%s listening on port %s, Ctrl+C to stop', config.id, config.port)
-  })
+  if (httpServer)
+    httpServer.timeout = 20000
 }
 
 if (require.main === module)