Merge branch 'develop' into api-v3

2015-11-17 23:15:15 -06:00
parent 05eb0ec782 553548046f
commit 08c4ec5557
222 changed files with 4155 additions and 6240 deletions
@@ -28,7 +28,10 @@ module.exports = function(server,mongoose) {
      });*/
      var memory = os.freemem() / os.totalmem(),
          memoryHigh = memory < 0.1;
-      if (memoryHigh) throw '[Memory Leak] Memory='+parseFloat(memory).toFixed(3)+' Time='+moment().format();
+      if (memoryHigh) {
+        var memoryLeakMessage = '[Memory Leak] Memory='+parseFloat(memory).toFixed(3)+' Time='+moment().format();
+        throw memoryLeakMessage;
+      }
    }, mins*60*1000);
  }