From be420a67a0f2c57b6ad72f799b12e253946e419a Mon Sep 17 00:00:00 2001 From: Kevin Gisi Date: Sun, 12 Jul 2015 13:39:16 -0400 Subject: [PATCH 1/2] Remove apdex check from middleware until NR is back --- website/src/middleware.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/src/middleware.js b/website/src/middleware.js index b34789f60b..4c4898b2ff 100644 --- a/website/src/middleware.js +++ b/website/src/middleware.js @@ -48,7 +48,7 @@ module.exports.domainMiddleware = function(server,mongoose) { apdexBad = score < .75 || score == 1, memory = os.freemem() / os.totalmem(), memoryHigh = false; //memory < 0.1; - if (apdexBad || memoryHigh) throw "[Memory Leak] Apdex="+score+" Memory="+parseFloat(memory).toFixed(3)+" Time="+moment().format(); + if (/*apdexBad || */memoryHigh) throw "[Memory Leak] Apdex="+score+" Memory="+parseFloat(memory).toFixed(3)+" Time="+moment().format(); }) }, mins*60*1000); } @@ -168,7 +168,7 @@ var getManifestFiles = function(page){ code += ''; }); } - + return code; } @@ -190,7 +190,7 @@ module.exports.locals = function(req, res, next) { isStaticPage: isStaticPage, translations: i18n.translations[language.code], t: function(){ // stringName and vars are the allowed parameters - var args = Array.prototype.slice.call(arguments, 0); + var args = Array.prototype.slice.call(arguments, 0); args.push(language.code); return shared.i18n.t.apply(null, args); }, From c82e5a885d65243fcd57843d65f2959763a326f3 Mon Sep 17 00:00:00 2001 From: Kevin Gisi Date: Sun, 12 Jul 2015 13:51:22 -0400 Subject: [PATCH 2/2] Put memory check back in --- website/src/middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/middleware.js b/website/src/middleware.js index 4c4898b2ff..de99b461b1 100644 --- a/website/src/middleware.js +++ b/website/src/middleware.js @@ -47,7 +47,7 @@ module.exports.domainMiddleware = function(server,mongoose) { score = ts[ts.length-1].values.score, apdexBad = score < .75 || score == 1, memory = os.freemem() / os.totalmem(), - memoryHigh = false; //memory < 0.1; + memoryHigh = memory < 0.1; if (/*apdexBad || */memoryHigh) throw "[Memory Leak] Apdex="+score+" Memory="+parseFloat(memory).toFixed(3)+" Time="+moment().format(); }) }, mins*60*1000);