From 491652d712d7190a78c199a6f33dbd4d295099ae Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Fri, 14 Aug 2015 12:00:09 +0200 Subject: [PATCH] fix several typypos and a missing dep --- website/src/libs/buildManifest.js | 13 +++++-------- website/src/middlewares/apiThrottle.js | 3 ++- website/src/middlewares/domain.js | 4 ++-- website/src/middlewares/errorHandler.js | 2 +- website/src/middlewares/locals.js | 4 ++-- website/src/middlewares/redirects.js | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/website/src/libs/buildManifest.js b/website/src/libs/buildManifest.js index ac4c35d19b..e2b337860f 100644 --- a/website/src/libs/buildManifest.js +++ b/website/src/libs/buildManifest.js @@ -9,10 +9,9 @@ var buildFiles = []; var walk = function(folder){ var res = fs.readdirSync(folder); - var files = []; res.forEach(function(fileName){ - file = folder + '/' + fileName; + var file = folder + '/' + fileName; if(fs.statSync(file).isDirectory()){ walk(file); }else{ @@ -24,12 +23,10 @@ var walk = function(folder){ fileName = relFolder + '/' + fileName; } - buildFiles[old] = fileName + buildFiles[old] = fileName; } }); - - return files; -} +}; walk(path.join(__dirname, "/../../build")); @@ -37,7 +34,7 @@ var getBuildUrl = module.exports.getBuildUrl = function(url){ if(buildFiles[url]) return '/' + buildFiles[url]; return '/' + url; -} +}; module.exports.getManifestFiles = function(page){ var files = manifestFiles[page]; @@ -59,4 +56,4 @@ module.exports.getManifestFiles = function(page){ } return code; -} +}; \ No newline at end of file diff --git a/website/src/middlewares/apiThrottle.js b/website/src/middlewares/apiThrottle.js index 44acad4fa2..b90f6861ea 100644 --- a/website/src/middlewares/apiThrottle.js +++ b/website/src/middlewares/apiThrottle.js @@ -1,4 +1,5 @@ var nconf = require('nconf'); +var limiter = require('connect-ratelimit'); var IS_PROD = nconf.get('NODE_ENV') === 'production'; @@ -18,4 +19,4 @@ module.exports = function(app) { if (res.ratelimit.exceeded) return res.json(429,{err:'Rate limit exceeded'}); next(); }); -} +}; \ No newline at end of file diff --git a/website/src/middlewares/domain.js b/website/src/middlewares/domain.js index 3178dc6188..e62c478797 100644 --- a/website/src/middlewares/domain.js +++ b/website/src/middlewares/domain.js @@ -23,7 +23,7 @@ module.exports = function(server,mongoose) { memory = os.freemem() / os.totalmem(), memoryHigh = memory < 0.1; if (/*apdexBad || */memoryHigh) throw "[Memory Leak] Apdex="+score+" Memory="+parseFloat(memory).toFixed(3)+" Time="+moment().format(); - }) + }); }, mins*60*1000); } @@ -36,4 +36,4 @@ module.exports = function(server,mongoose) { }, killTimeout: 10000 }); -} +}; diff --git a/website/src/middlewares/errorHandler.js b/website/src/middlewares/errorHandler.js index d07476e76f..eebf25ac6b 100644 --- a/website/src/middlewares/errorHandler.js +++ b/website/src/middlewares/errorHandler.js @@ -21,4 +21,4 @@ module.exports = function(err, req, res, next) { var message = err.message ? err.message : err; message = (message.length < 200) ? message : message.substring(0,100) + message.substring(message.length-100,message.length); res.json(500,{err:message}); //res.end(err.message); -} +}; diff --git a/website/src/middlewares/locals.js b/website/src/middlewares/locals.js index c77fe6cd90..fa693895c1 100644 --- a/website/src/middlewares/locals.js +++ b/website/src/middlewares/locals.js @@ -44,8 +44,8 @@ module.exports = function(req, res, next) { // Put query-string party (& guild but use partyInvite for backward compatibility) // invitations into session to be handled later try{ - req.session.partyInvite = JSON.parse(utils.decrypt(req.query.partyInvite)) + req.session.partyInvite = JSON.parse(utils.decrypt(req.query.partyInvite)); } catch(e){} next(); -} +}; \ No newline at end of file diff --git a/website/src/middlewares/redirects.js b/website/src/middlewares/redirects.js index 8a334c7401..25b8d44fa9 100644 --- a/website/src/middlewares/redirects.js +++ b/website/src/middlewares/redirects.js @@ -25,7 +25,7 @@ module.exports.forceSSL = function(req, res, next){ } next(); -} +}; // Redirect to habitica for non-api urls // NOTE: Currently using a static 'habitica.com' string, rather than BASE_URL, @@ -40,4 +40,4 @@ module.exports.forceHabitica = function(req, res, next) { return res.redirect('https://habitica.com' + req.url); } next(); -}; +}; \ No newline at end of file