Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update logger to build logging function without Eval #2

Merged
merged 4 commits into from
Mar 20, 2011
Merged

Update logger to build logging function without Eval #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d65200b
-- Setup log messages without use of eval
benjisg Mar 19, 2011
1810e52
-- Fix for logger that passes state to logging function
benjisg Mar 19, 2011
15b38fd
Fixed key_copy comparison bug related to previous commit
benjisg Mar 20, 2011
f8bd1b8
Removed unnecessary string slice and key_copy creation
benjisg Mar 20, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions logger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ logger.log = function (data) {

logger._init_loglevel = function () {
var _loglevel = config.get('loglevel', 'nolog', 'value');
if (_loglevel) {
if (_loglevel) {
var loglevel_num = parseInt(_loglevel);
if (!loglevel_num || loglevel_num === NaN) {
loglevel = logger[_loglevel.toUpperCase()];
Expand All @@ -35,19 +35,22 @@ logger._init_loglevel = function () {
loglevel = logger.LOGWARN;
}
}
// logger.log("Set log level to: " + loglevel);
};

logger._init_loglevel();

for (var key in logger) {
if (key.match(/^LOG\w/)) {
var level = key.slice(3);
var key_copy = key.slice(0); // copy
// For some reason I have to use eval here or this doesn't work...
eval("logger." + key.toLowerCase() +
" = function (data) { if (loglevel >= " + logger[key_copy] +
") { logger.log(\"" + level + ": \" + data); } }");
var level, key;
for (key in logger) {
if(logger.hasOwnProperty(key)) {
if (key.match(/^LOG\w/)) {
level = key.slice(3);
logger[key.toLowerCase()] = (function(level, key) {
return function(data) {
if (loglevel >= logger[key]) {
logger.log("[" + level + "] " + data);
}
}
})(level, key);
}
}
}