From eb5f9e569a283e439ea4c70b3179a62aeb5d6d63 Mon Sep 17 00:00:00 2001 From: indexzero Date: Sun, 17 Jul 2011 19:12:53 -0700 Subject: [PATCH] [refactor minor] Move lib/winston/utils.js to lib/winston/internal.js --- lib/winston.js | 20 +++++++++----------- lib/winston/{utils.js => internal.js} | 2 +- lib/winston/logger.js | 4 ++-- lib/winston/transports/console.js | 2 +- lib/winston/transports/file.js | 2 +- lib/winston/transports/loggly.js | 4 ++-- lib/winston/transports/webhook.js | 6 +++--- 7 files changed, 19 insertions(+), 21 deletions(-) rename lib/winston/{utils.js => internal.js} (97%) diff --git a/lib/winston.js b/lib/winston.js index 8313719d8..7ba99a6cc 100644 --- a/lib/winston.js +++ b/lib/winston.js @@ -6,8 +6,6 @@ * */ -require.paths.unshift(require('path').join(__dirname)); - var winston = exports; // @@ -18,7 +16,7 @@ require('pkginfo')(module, 'version'); // // Include transports defined by default by winston // -winston.transports = require('winston/transports'); +winston.transports = require('./winston/transports'); // // function findTransport (transport) @@ -32,11 +30,11 @@ winston.findTransport = function (transport) { return existing.length > 0 ? existing[0].toLowerCase() : null; }; -var utils = require('winston/utils'); -winston.hash = utils.hash; -winston.clone = utils.clone; -winston.longestElement = utils.longestElement; -winston.config = require('winston/config'); +var internal = require('./winston/internal'); +winston.hash = internal.hash; +winston.clone = internal.clone; +winston.longestElement = internal.longestElement; +winston.config = require('./winston/config'); winston.addColors = winston.config.addColors; winston.Logger = require('winston/logger').Logger; @@ -48,7 +46,7 @@ winston.Logger = require('winston/logger').Logger; // winston.error('some error'); // var defaultLogger = new (winston.Logger)({ transports: [new (winston.transports.Console)()] }); -utils.setLevels(winston, null, defaultLogger.levels); +internal.setLevels(winston, null, defaultLogger.levels); ['log', 'add', 'remove', 'profile', 'extend', 'cli'].forEach(function (method) { winston[method] = function () { @@ -58,7 +56,7 @@ utils.setLevels(winston, null, defaultLogger.levels); winston.cli = function (foo, bar) { winston.padLevels = true; - utils.setLevels(winston, defaultLogger.levels, winston.config.cli.levels); + internal.setLevels(winston, defaultLogger.levels, winston.config.cli.levels); defaultLogger.setLevels(winston.config.cli.levels); winston.config.addColors(winston.config.cli.colors); @@ -71,7 +69,7 @@ winston.cli = function (foo, bar) { }; winston.setLevels = function (levels) { - utils.setLevels(winston, defaultLogger.levels, levels); + internal.setLevels(winston, defaultLogger.levels, levels); defaultLogger.setLevels(levels); }; diff --git a/lib/winston/utils.js b/lib/winston/internal.js similarity index 97% rename from lib/winston/utils.js rename to lib/winston/internal.js index bf06f10bb..2244be693 100644 --- a/lib/winston/utils.js +++ b/lib/winston/internal.js @@ -1,5 +1,5 @@ /* - * index.js: Top-level include for Winston + * internal.js: Internal helper and utility functions for winston * * (C) 2010 Charlie Robbins * MIT LICENCE diff --git a/lib/winston/logger.js b/lib/winston/logger.js index d85bc87a6..1e4a53eed 100644 --- a/lib/winston/logger.js +++ b/lib/winston/logger.js @@ -11,7 +11,7 @@ require.paths.unshift(require('path').join(__dirname, '..')); var util = require('util'), events = require('events'), winston = require('winston'), - utils = require('./utils'); + internal = require('./internal'); function capitalize(str) { return str && str[0].toUpperCase() + str.slice(1); @@ -225,7 +225,7 @@ Logger.prototype.profile = function (id) { }; Logger.prototype.setLevels = function (current) { - return utils.setLevels(this, this.levels, current); + return internal.setLevels(this, this.levels, current); }; Logger.prototype.cli = function () { diff --git a/lib/winston/transports/console.js b/lib/winston/transports/console.js index 1e18712d0..57445c91a 100644 --- a/lib/winston/transports/console.js +++ b/lib/winston/transports/console.js @@ -9,7 +9,7 @@ var events = require('events'), util = require('util'), colors = require('colors'), - log = require('./../utils').log; + log = require('../internal').log; // // ### function Console (options) diff --git a/lib/winston/transports/file.js b/lib/winston/transports/file.js index 7b223599d..0cbca17ef 100644 --- a/lib/winston/transports/file.js +++ b/lib/winston/transports/file.js @@ -11,7 +11,7 @@ var events = require('events'), path = require('path'), util = require('util'), colors = require('colors'), - log = require('./../utils').log; + log = require('../internal').log; // // ### function File (options) diff --git a/lib/winston/transports/loggly.js b/lib/winston/transports/loggly.js index 992c88e4a..16d457990 100644 --- a/lib/winston/transports/loggly.js +++ b/lib/winston/transports/loggly.js @@ -9,7 +9,7 @@ var events = require('events'), loggly = require('loggly'), util = require('util'), - utils = require('./../utils'); + internal = require('../internal'); // // ### function Loggly (options) @@ -76,7 +76,7 @@ util.inherits(Loggly, events.EventEmitter); // Core logging method exposed to Winston. Metadata is optional. // Loggly.prototype.log = function (level, msg, meta, callback) { - var message = utils.clone(meta); + var message = internal.clone(meta); message.level = level; message.message = msg; diff --git a/lib/winston/transports/webhook.js b/lib/winston/transports/webhook.js index e456d5385..0c125b403 100644 --- a/lib/winston/transports/webhook.js +++ b/lib/winston/transports/webhook.js @@ -9,7 +9,7 @@ var events = require('events'), http = require('http'), util = require('util'), - utils = require('./../utils'); + internal = require('../internal'); // // ### function WebHook (options) @@ -61,7 +61,7 @@ Webhook.prototype.log = function (level, msg, meta, callback) { } var self = this, - message = utils.clone(meta), + message = internal.clone(meta), options, req; @@ -101,7 +101,7 @@ Webhook.prototype.log = function (level, msg, meta, callback) { req.write(JSON.stringify({ method: 'log', params: { - timestamp: utils.timestamp(), + timestamp: internal.timestamp(), msg: msg, level: level, meta: meta