From 0ed1a137d6af8bda15bf2dd097d3c12bf84c1c99 Mon Sep 17 00:00:00 2001
From: Gareth Jones <gareth.jones@sensis.com.au>
Date: Thu, 31 May 2012 08:16:22 +1000
Subject: [PATCH] moved Logger class out of main module

---
 lib/log4js.js | 77 +++------------------------------------------------
 1 file changed, 4 insertions(+), 73 deletions(-)

diff --git a/lib/log4js.js b/lib/log4js.js
index 125c1e0..4014105 100644
--- a/lib/log4js.js
+++ b/lib/log4js.js
@@ -50,7 +50,8 @@ var events = require('events')
 , util = require('util')
 , layouts = require('./layouts')
 , levels = require('./levels')
-, DEFAULT_CATEGORY = '[default]'
+, LoggingEvent = require('./logger').LoggingEvent
+, Logger = require('./logger').Logger
 , ALL_CATEGORIES = '[all]'
 , appenders = {}
 , loggers = {}
@@ -62,76 +63,6 @@ var events = require('events')
     replaceConsole: false
 };
 
-
-/**
- * Models a logging event.
- * @constructor
- * @param {String} categoryName name of category
- * @param {Log4js.Level} level level of message
- * @param {Array} data objects to log
- * @param {Log4js.Logger} logger the associated logger
- * @author Seth Chisamore
- */
-function LoggingEvent (categoryName, level, data, logger) {
-    this.startTime = new Date();
-    this.categoryName = categoryName;
-    this.data = data;
-    this.level = level;
-    this.logger = logger;
-}
-
-/**
- * Logger to log messages.
- * use {@see Log4js#getLogger(String)} to get an instance.
- * @constructor
- * @param name name of category to log to
- * @author Stephan Strittmatter
- */
-function Logger (name, level) {
-    this.category = name || DEFAULT_CATEGORY;
-
-    if (! this.level) {
-        this.__proto__.level = levels.TRACE;
-    }
-}
-util.inherits(Logger, events.EventEmitter);
-
-Logger.prototype.setLevel = function(level) {
-    this.level = levels.toLevel(level, this.level || levels.TRACE);
-};
-
-Logger.prototype.removeLevel = function() {
-    delete this.level;
-};
-
-Logger.prototype.log = function() {
-    var args = Array.prototype.slice.call(arguments)
-  , logLevel = args.shift()
-  , loggingEvent = new LoggingEvent(this.category, logLevel, args, this);
-    this.emit("log", loggingEvent);
-};
-
-Logger.prototype.isLevelEnabled = function(otherLevel) {
-    return this.level.isLessThanOrEqualTo(otherLevel);
-};
-
-['Trace','Debug','Info','Warn','Error','Fatal'].forEach(
-    function(levelString) {
-        var level = levels.toLevel(levelString);
-        Logger.prototype['is'+levelString+'Enabled'] = function() {
-            return this.isLevelEnabled(level);
-        };
-
-        Logger.prototype[levelString.toLowerCase()] = function () {
-            if (this.isLevelEnabled(level)) {
-                var args = Array.prototype.slice.call(arguments);
-                args.unshift(level);
-                Logger.prototype.log.apply(this, args);
-            }
-        };
-    }
-);
-
 /**
  * Get a logger instance. Instance is cached on categoryName level.
  * @param  {String} categoryName name of category to log to.
@@ -142,7 +73,7 @@ function getLogger (categoryName) {
 
     // Use default logger if categoryName is not specified or invalid
     if (!(typeof categoryName == "string")) {
-        categoryName = DEFAULT_CATEGORY;
+        categoryName = Logger.DEFAULT_CATEGORY;
     }
 
     var appenderList;
@@ -244,7 +175,7 @@ function setGlobalLogLevel(level) {
  * @static
  */
 function getDefaultLogger () {
-    return getLogger(DEFAULT_CATEGORY);
+    return getLogger(Logger.DEFAULT_CATEGORY);
 }
 
 var configState = {};