From 6680ecac6bfed893d98ef9372ea7073ccb11a986 Mon Sep 17 00:00:00 2001 From: Nick Santos Date: Tue, 8 Jul 2014 23:07:29 -0400 Subject: [PATCH] fix up the unit tests --- .gitignore | 1 + lib/logger.js | 33 +++++++++++++++------------------ package.json | 8 +++++++- 3 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/lib/logger.js b/lib/logger.js index c27eb60..e372081 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -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); }; /** @@ -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(); } - }; diff --git a/package.json b/package.json index ba8044f..6fee6ed 100644 --- a/package.json +++ b/package.json @@ -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" + } }