Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix up the unit tests
  • Loading branch information
Nick Santos committed Jul 9, 2014
1 parent 33f5f41 commit 6680eca
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 19 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -0,0 +1 @@
node_modules
33 changes: 15 additions & 18 deletions lib/logger.js
Expand Up @@ -108,7 +108,8 @@ Logger.prototype.setMeta = function(key, value) {
* @param {function(LogRecord)} watcher
*/
Logger.prototype.registerWatcher = function(watcher) {
this.on('', watcher);
var rootLogger = Logger.getSingleton();
rootLogger.on(this.name, watcher);
};

/**
Expand All @@ -123,28 +124,24 @@ Logger.prototype.log = function(level, var_args) {
//
// Event emitting plan in sequence:
//
// * If message is loggable emit on global key from rootLogger.
// * If not rootLogger emit LEVEL event on instance and bubble up to and
// including rootLogger.
// * If not rootLogger emit Logger NAME event on instance and bubble up to and
// including rootLogger.
//
//
if (this.isLoggable(level)) {
rootLogger.emit('', logRecord);
// * Emit on global key from rootLogger.
// * Emit a LEVEL event on the rootLogger
// * For each name in the ancestor chain, emit an event of that name.
if (!this.isLoggable(level)) {
return
}

if (this.name) {
var name;
var logger = this;
rootLogger.emit(level, logRecord);
while (logger && rootLogger !== logger) {
name = logger.name
rootLogger.emit('', logRecord);
rootLogger.emit(level, logRecord);

var logger = this;
while (logger && rootLogger !== logger) {
var name = logger.name
if (name) {
rootLogger.emit(name, logRecord);
logger = logger.getParent();
}
logger = logger.getParent();
}

};


Expand Down
8 changes: 7 additions & 1 deletion package.json
Expand Up @@ -14,5 +14,11 @@
"url" : "http://pupius.co.uk"
},
"main" : "./lib/logg.js",
"directories": {"lib": "./lib"}
"directories": {"lib": "./lib"},
"devDependencies": {
"nodeunit": "0.9.0"
},
"scripts": {
"test": "./node_modules/.bin/nodeunit lib/*_test.js"
}
}

0 comments on commit 6680eca

Please sign in to comment.