replaced my debug lib with standard one
This commit is contained in:
+15
-8
@@ -46,7 +46,7 @@
|
||||
* @static
|
||||
* Website: http://log4js.berlios.de
|
||||
*/
|
||||
var debug = require('./debug')('core')
|
||||
var debug = require('debug')('log4js:core')
|
||||
, fs = require('fs')
|
||||
, cluster = require('cluster')
|
||||
, util = require('util')
|
||||
@@ -90,10 +90,10 @@ function deserialise(serialised) {
|
||||
//in a multi-process node environment, worker loggers will use
|
||||
//process.send
|
||||
cluster.on('fork', function(worker) {
|
||||
debug('listening to worker: ' + worker);
|
||||
debug('listening to worker: ', worker);
|
||||
worker.on('message', function(message) {
|
||||
if (message.type && message.type === '::log4js-message') {
|
||||
debug("received message: " + message.event);
|
||||
debug("received message: ", message.event);
|
||||
dispatch(deserialise(message.event));
|
||||
}
|
||||
});
|
||||
@@ -106,7 +106,7 @@ cluster.on('fork', function(worker) {
|
||||
* @static
|
||||
*/
|
||||
function getLogger (category) {
|
||||
debug("getLogger(" + category + ")");
|
||||
debug("getLogger(", category, ")");
|
||||
|
||||
return new Logger(
|
||||
cluster.isMaster ? dispatch : workerDispatch,
|
||||
@@ -123,9 +123,9 @@ function workerDispatch(event) {
|
||||
* This would be a good place to implement category hierarchies/wildcards, etc
|
||||
*/
|
||||
function dispatch(event) {
|
||||
debug("event is " + util.inspect(event));
|
||||
debug("event is ", event);
|
||||
var category = categories[event.category] || categories.default;
|
||||
debug("category.level[" + category.level + "] <= " + event.level + " ? " + category.level.isLessThanOrEqualTo(event.level));
|
||||
debug("category.level[", category.level, "] <= ", event.level, " ? ", category.level.isLessThanOrEqualTo(event.level));
|
||||
|
||||
if (category.level.isLessThanOrEqualTo(event.level)) {
|
||||
category.appenders.forEach(function(appender) {
|
||||
@@ -135,17 +135,24 @@ function dispatch(event) {
|
||||
}
|
||||
|
||||
function load(file) {
|
||||
debug("loading ", file);
|
||||
return JSON.parse(fs.readFileSync(file, "utf-8"));
|
||||
}
|
||||
|
||||
function configure(configurationFileOrObject) {
|
||||
var filename, config = configurationFileOrObject || process.env.LOG4JS_CONFIG;
|
||||
|
||||
debug("configure(", configurationFileOrObject, ")");
|
||||
debug("process.env.LOG4JS_CONFIG = ", process.env.LOG4JS_CONFIG);
|
||||
|
||||
var filename, config = process.env.LOG4JS_CONFIG || configurationFileOrObject;
|
||||
|
||||
debug("config ", config);
|
||||
|
||||
if (!config || !(typeof config === 'string' || typeof config === 'object')) {
|
||||
throw new Error("You must specify configuration as an object or a filename.");
|
||||
}
|
||||
|
||||
if (typeof config === 'string') {
|
||||
debug("config is string");
|
||||
filename = config;
|
||||
config = load(filename);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user