Merge pull request #1 from CartoDB/master

Upstream update, adds x-forwarde-for by default

lib/log4js.js

@@ -65,6 +65,8 @@ var events = require('events')
   replaceConsole: false
 };
 
+require('./appenders/console');
+
 function hasLogger(logger) {
   return loggers.hasOwnProperty(logger);
 }
@@ -92,6 +94,22 @@ function getBufferedLogger(categoryName) {
     return logger;
 }
 
+function normalizeCategory (category) {
+  return  category + '.';
+}
+
+function doesLevelEntryContainsLogger (levelCategory, loggerCategory) {  
+  var normalizedLevelCategory = normalizeCategory(levelCategory);
+  var normalizedLoggerCategory = normalizeCategory(loggerCategory);
+  return normalizedLoggerCategory.substring(0, normalizedLevelCategory.length) == normalizedLevelCategory;
+}
+
+function doesAppenderContainsLogger (appenderCategory, loggerCategory) {
+  var normalizedAppenderCategory = normalizeCategory(appenderCategory);
+  var normalizedLoggerCategory = normalizeCategory(loggerCategory);
+  return normalizedLoggerCategory.substring(0, normalizedAppenderCategory.length) == normalizedAppenderCategory;
+}
+
 
 /**
  * Get a logger instance. Instance is cached on categoryName level.
@@ -99,32 +117,51 @@ function getBufferedLogger(categoryName) {
  * @return {Logger} instance of logger for the category
  * @static
  */
-function getLogger (categoryName) {
+function getLogger (loggerCategoryName) {
 
   // Use default logger if categoryName is not specified or invalid
-  if (typeof categoryName !== "string") {
-    categoryName = Logger.DEFAULT_CATEGORY;
+  if (typeof loggerCategoryName !== "string") {
+    loggerCategoryName = Logger.DEFAULT_CATEGORY;
   }
 
-  var appenderList;
-  if (!hasLogger(categoryName)) {
+  if (!hasLogger(loggerCategoryName)) {
+
+    var level = undefined;
+
+    // If there's a "levels" entry in the configuration
+    if (levels.config) {
+      // Goes through the categories in the levels configuration entry, starting by the "higher" ones.
+      var keys = Object.keys(levels.config).sort();
+      for (var idx = 0; idx < keys.length; idx++) {
+        var levelCategory = keys[idx];
+        if (doesLevelEntryContainsLogger(levelCategory, loggerCategoryName)) {
+          // level for the logger
+          level = levels.config[levelCategory];
+        }
+      }
+    }
+  
     // Create the logger for this name if it doesn't already exist
-    loggers[categoryName] = new Logger(categoryName);
-    if (appenders[categoryName]) {
-      appenderList = appenders[categoryName];
-      appenderList.forEach(function(appender) {
-        loggers[categoryName].addListener("log", appender);
-      });
+    loggers[loggerCategoryName] = new Logger(loggerCategoryName, level);
+
+    var appenderList;
+    for(var appenderCategory in appenders) {
+      if (doesAppenderContainsLogger(appenderCategory, loggerCategoryName)) {
+        appenderList = appenders[appenderCategory];
+        appenderList.forEach(function(appender) {
+          loggers[loggerCategoryName].addListener("log", appender);
+        });
+      }
     }
     if (appenders[ALL_CATEGORIES]) {
       appenderList = appenders[ALL_CATEGORIES];
       appenderList.forEach(function(appender) {
-        loggers[categoryName].addListener("log", appender);
+        loggers[loggerCategoryName].addListener("log", appender);
       });
     }
   }
   
-  return loggers[categoryName];
+  return loggers[loggerCategoryName];
 }
 
 /**
@@ -141,13 +178,19 @@ function addAppender () {
     args = args[0];
   }
   
-  args.forEach(function(category) {
-    addAppenderToCategory(appender, category);
+  args.forEach(function(appenderCategory) {
+    addAppenderToCategory(appender, appenderCategory);
     
-    if (category === ALL_CATEGORIES) {
+    if (appenderCategory === ALL_CATEGORIES) {
       addAppenderToAllLoggers(appender);
-    } else if (hasLogger(category)) {
-      loggers[category].addListener("log", appender);
+    } else {
+
+      for(var loggerCategory in loggers) {
+        if (doesAppenderContainsLogger(appenderCategory,loggerCategory)) {
+          loggers[loggerCategory].addListener("log", appender);
+        }
+      }
+      
     }
   });
 }
@@ -198,14 +241,19 @@ function configureAppenders(appenderList, options) {
   }
 }
 
-function configureLevels(levels) {
-  if (levels) {
-    for (var category in levels) {
-      if (levels.hasOwnProperty(category)) {
-        if(category === ALL_CATEGORIES) {
-          setGlobalLogLevel(levels[category]);
+function configureLevels(_levels) {
+  levels.config = _levels; // Keep it so we can create loggers later using this cfg
+  if (_levels) {
+    var keys = Object.keys(levels.config).sort();
+    for (var idx in keys) {
+      var category = keys[idx];
+      if(category === ALL_CATEGORIES) {
+        setGlobalLogLevel(_levels[category]);
+      }        
+      for(var loggerCategory in loggers) {
+        if (doesLevelEntryContainsLogger(category, loggerCategory)) {
+          loggers[loggerCategory].setLevel(_levels[category]);
         }
-        getLogger(category).setLevel(levels[category]);
       }
     }
   }
@@ -236,8 +284,8 @@ function loadConfigurationFile(filename) {
 function configureOnceOff(config, options) {
   if (config) {
     try {
-      configureAppenders(config.appenders, options);
       configureLevels(config.levels);
+      configureAppenders(config.appenders, options);
       
       if (config.replaceConsole) {
         replaceConsole();
@@ -253,12 +301,12 @@ function configureOnceOff(config, options) {
   }
 }
 
-function reloadConfiguration() {
+function reloadConfiguration(options) {
   var mtime = getMTime(configState.filename);
   if (!mtime) return;
-
+  
   if (configState.lastMTime && (mtime.getTime() > configState.lastMTime.getTime())) {
-    configureOnceOff(loadConfigurationFile(configState.filename));
+    configureOnceOff(loadConfigurationFile(configState.filename), options);
   }
   configState.lastMTime = mtime;
 }
@@ -280,7 +328,7 @@ function initReloadConfiguration(filename, options) {
   }
   configState.filename = filename;
   configState.lastMTime = getMTime(filename);
-  configState.timerId = setInterval(reloadConfiguration, options.reloadSecs*1000);
+  configState.timerId = setInterval(reloadConfiguration, options.reloadSecs*1000, options);
 }
 
 function configure(configurationFileOrObject, options) {