Skip to content

Commit

Permalink
fix several typypos and a missing dep
Browse files Browse the repository at this point in the history
  • Loading branch information
paglias committed Aug 14, 2015
1 parent 47f6f2f commit 491652d
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 16 deletions.
13 changes: 5 additions & 8 deletions website/src/libs/buildManifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -24,20 +23,18 @@ var walk = function(folder){
fileName = relFolder + '/' + fileName;
}

buildFiles[old] = fileName
buildFiles[old] = fileName;
}
});

return files;
}
};

walk(path.join(__dirname, "/../../build"));

var getBuildUrl = module.exports.getBuildUrl = function(url){
if(buildFiles[url]) return '/' + buildFiles[url];

return '/' + url;
}
};

module.exports.getManifestFiles = function(page){
var files = manifestFiles[page];
Expand All @@ -59,4 +56,4 @@ module.exports.getManifestFiles = function(page){
}

return code;
}
};
3 changes: 2 additions & 1 deletion website/src/middlewares/apiThrottle.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var nconf = require('nconf');
var limiter = require('connect-ratelimit');

var IS_PROD = nconf.get('NODE_ENV') === 'production';

Expand All @@ -18,4 +19,4 @@ module.exports = function(app) {
if (res.ratelimit.exceeded) return res.json(429,{err:'Rate limit exceeded'});
next();
});
}
};
4 changes: 2 additions & 2 deletions website/src/middlewares/domain.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -36,4 +36,4 @@ module.exports = function(server,mongoose) {
},
killTimeout: 10000
});
}
};
2 changes: 1 addition & 1 deletion website/src/middlewares/errorHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
};
4 changes: 2 additions & 2 deletions website/src/middlewares/locals.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
};
4 changes: 2 additions & 2 deletions website/src/middlewares/redirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -40,4 +40,4 @@ module.exports.forceHabitica = function(req, res, next) {
return res.redirect('https://habitica.com' + req.url);
}
next();
};
};

0 comments on commit 491652d

Please sign in to comment.