add more debug output for CI

.travis.yml

@@ -9,6 +9,7 @@ services:
 env:
   DOCKER_COMPOSE_VERSION: 1.8.0
   CXX: g++-4.8
+  DEBUG: crater-util:kill,crater-util:kill:ps,crater:shutdown
 
 addons:
   apt:

package.json

@@ -28,6 +28,7 @@
   "dependencies": {
     "babel-runtime": "^6.11.6",
     "bcrypt": "^0.8.7",
+    "debug": "^2.2.0",
     "es6-promisify": "^4.1.0",
     "express": "^4.14.0",
     "immutable": "^3.8.1",
@@ -65,7 +66,7 @@
     "babel-register": "^6.14.0",
     "chai": "^3.5.0",
     "coveralls": "^2.11.14",
-    "crater-util": "^1.1.3",
+    "crater-util": "^1.1.5",
     "cross-spawn": "^4.0.0",
     "css-loader": "^0.24.0",
     "dotenv": "^2.0.0",

scripts/devServer.js

@@ -2,6 +2,9 @@
 
 import express from 'express'
 import webpackConfig from '../webpack/webpack.config.dev'
+import createDebug from 'debug'
+
+const shutdownDebug = createDebug('crater:shutdown')
 
 if (process.env.USE_DOTENV) require('dotenv').config()
 const {PORT} = process.env
@@ -25,3 +28,13 @@ const server = app.listen(webpackConfig.devServer.port)
 server.on('upgrade', (req: Object, socket: any, head: any): any => proxy.ws(req, socket, head, { target }))
 
 console.log(`Dev server is listening on http://0.0.0.0:${webpackConfig.devServer.port}`)
+
+function shutdown() {
+  shutdownDebug('got signal, shutting down')
+  server.stop()
+  process.exit(0)
+}
+
+process.on('SIGINT', shutdown)
+process.on('SIGTERM', shutdown)
+

src/server/index.js

@@ -4,6 +4,9 @@ import express from 'express'
 import path from 'path'
 import createSSR from './createSSR'
 import { WebApp } from 'meteor/webapp'
+import createDebug from 'debug'
+
+const shutdownDebug = createDebug('crater:shutdown')
 
 import '../universal/collections/Counts'
 
@@ -35,5 +38,12 @@ WebApp.rawConnectHandlers.use(app)
 
 console.log(`App is listening on http://0.0.0.0:${process.env.PORT || '80'}`) // eslint-disable-line no-console
 
-process.on('SIGINT', (): any => process.exit(0))
-process.on('SIGTERM', (): any => process.exit(0))
+function shutdown() {
+  shutdownDebug('got signal, shutting down')
+  WebApp.httpServer.stop()
+  process.exit(0)
+}
+
+process.on('SIGINT', shutdown)
+process.on('SIGTERM', shutdown)
+

test/integration/integrationTests.js

@@ -140,8 +140,8 @@ describe('prod mode with DISABLE_FULL_SSR=1', function () {
 
   after(async function () {
     this.timeout(30000)
-    if (process.env.BABEL_ENV === 'coverage') await mergeClientCoverage()
     if (server) await kill(server, 'SIGINT')
+    if (process.env.BABEL_ENV === 'coverage') await mergeClientCoverage()
   })
 })