Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop

src/middleware.js

@@ -5,6 +5,8 @@ var path = require('path');
 var User = require('./models/user').model
 var limiter = require('connect-ratelimit');
 var logging = require('./logging');
+var domainMiddleware = require('domain-middleware');
+var cluster = require('cluster');
 
 module.exports.apiThrottle = function(app) {
   if (nconf.get('NODE_ENV') !== 'production') return;
@@ -24,6 +26,18 @@ module.exports.apiThrottle = function(app) {
   });
 }
 
+module.exports.domainMiddleware = function(server,mongoose) {
+  return domainMiddleware({
+    server: {
+      close:function(){
+        server.close();
+        mongoose.connection.close();
+      }
+    },
+    killTimeout: 10000
+  });
+}
+
 module.exports.errorHandler = function(err, req, res, next) {
   //res.locals.domain.emit('error', err);
   // when we hit an error, send it to admin as an email. If no ADMIN_EMAIL is present, just send it to yourself (SMTP_USER)