Calling color_console instead of console from daily logger, so color …

…console configuration can work.
baryon · Oct 27, 2015 · d28da8d · d28da8d
1 parent ceaeeed
commit d28da8d
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ logger.warn('hello %s %d %j', 'world', 123, {foo:'bar'});
 logger.error('hello %s %d %j', 'world', 123, {foo:'bar'}, [1, 2, 3, 4], Object);
 ```
 
-dailylog will output all types log to diff files every day like log4j
+> dailylog will output all types log to diff files every day like log4j
 
 Advanced Example
 ---------------

diff --git a/lib/dailyfile.js b/lib/dailyfile.js
@@ -1,59 +1,59 @@
-var fs = require('fs'),dateFormat = require('dateformat'), tinytim = require('tinytim'), utils = require('./utils');
+var fs = require('fs'), dateFormat = require('dateformat'), tinytim = require('tinytim'), utils = require('./utils');
 var path = require('path');
 
-module.exports = function(conf) {
-	var _conf = {
-		root : '.',
-		logPathFormat : '{{root}}/{{prefix}}.{{date}}.log',
-		splitFormat : 'yyyymmdd'
-	};
-	
-	_conf = utils.union(_conf, [conf]);
-	
-	function LogFile(prefix, date) {
-		this.date = date;
-		this.prefix = prefix;
-	    this.path = tinytim.tim(_conf.logPathFormat, {root:_conf.root, prefix:prefix, date:date});
-      (function mkdirSync_p(dir) {
-        if (fs.existsSync(dir)) return;
-        mkdirSync_p(path.dirname(dir));
-        fs.mkdirSync(dir);
-      })(_conf.root);
-	    this.stream = fs.createWriteStream(this.path, {
-		    flags: "a",
-		    encoding: "utf8",
-		    mode: 0666
-		});
-	}
-
-	LogFile.prototype.write = function(str) {
-	    this.stream.write(str+"\n");
-	};
-
-	LogFile.prototype.destroy = function() {
-	    if (this.stream) {
-	        this.stream.end();
-	        this.stream.destroySoon();
-	        this.stream = null;
-	    }
-	};
-
-	var _logMap = {};
-
-	function _push2File(str, title) {
-	    var logFile = _logMap[title], now = dateFormat(new Date(), _conf.splitFormat)
-	    if(logFile && logFile.date != now) {
-	        logFile.destroy();
-	        logFile = null;
-	    }
-	    if(!logFile)
-	    	logFile = _logMap[title] = new LogFile(title, now);
-	    logFile.write(str);
-	}
-
-	return require('./console')({
-		transport : function(data) {
-			_push2File(data.output, data.title);
-		}
-	}, conf);
-};
+module.exports = function (conf) {
+    var _conf = {
+        root: '.',
+        logPathFormat: '{{root}}/{{prefix}}.{{date}}.log',
+        splitFormat: 'yyyymmdd'
+    };
+
+    _conf = utils.union(_conf, [conf]);
+
+    function LogFile(prefix, date) {
+        this.date = date;
+        this.prefix = prefix;
+        this.path = tinytim.tim(_conf.logPathFormat, {root: _conf.root, prefix: prefix, date: date});
+        (function mkdirSync_p(dir) {
+            if (fs.existsSync(dir)) return;
+            mkdirSync_p(path.dirname(dir));
+            fs.mkdirSync(dir);
+        })(_conf.root);
+        this.stream = fs.createWriteStream(this.path, {
+            flags: "a",
+            encoding: "utf8",
+            mode: 0666
+        });
+    }
+
+    LogFile.prototype.write = function (str) {
+        this.stream.write(str + "\n");
+    };
+
+    LogFile.prototype.destroy = function () {
+        if (this.stream) {
+            this.stream.end();
+            this.stream.destroySoon();
+            this.stream = null;
+        }
+    };
+
+    var _logMap = {};
+
+    function _push2File(str, title) {
+        var logFile = _logMap[title], now = dateFormat(new Date(), _conf.splitFormat);
+        if (logFile && logFile.date != now) {
+            logFile.destroy();
+            logFile = null;
+        }
+        if (!logFile)
+            logFile = _logMap[title] = new LogFile(title, now);
+        logFile.write(str);
+    }
+
+    return require('./color_console')({
+        transport: function (data) {
+            _push2File(data.output, data.title);
+        }
+    }, conf);
+};