Merge branch 'reader'

tj · tj · commit d963983d6e75 · 2010-09-26T12:00:02.000-07:00
diff --git a/examples/file.log b/examples/file.log
@@ -1,8 +1,8 @@
-[Sun, 26 Sep 2010 01:10:23 GMT] DEBUG a debug message
-[Sun, 26 Sep 2010 01:10:23 GMT] INFO a info message
-[Sun, 26 Sep 2010 01:10:23 GMT] NOTICE a notice message
-[Sun, 26 Sep 2010 01:10:23 GMT] WARNING a warning message
-[Sun, 26 Sep 2010 01:10:23 GMT] ERROR a error message
-[Sun, 26 Sep 2010 01:10:23 GMT] CRITICAL a critical message
-[Sun, 26 Sep 2010 01:10:23 GMT] ALERT a alert message
-[Sun, 26 Sep 2010 01:10:23 GMT] EMERGENCY a emergency message
+[Sun, 26 Sep 2010 01:26:14 GMT] DEBUG a debug message
+[Sun, 26 Sep 2010 01:26:14 GMT] INFO a info message
+[Sun, 26 Sep 2010 01:26:14 GMT] NOTICE a notice message
+[Sun, 26 Sep 2010 01:26:14 GMT] WARNING a warning message
+[Sun, 26 Sep 2010 01:26:14 GMT] ERROR a error message
+[Sun, 26 Sep 2010 01:26:14 GMT] CRITICAL a critical message
+[Sun, 26 Sep 2010 01:26:14 GMT] ALERT a alert message
+[Sun, 26 Sep 2010 01:26:14 GMT] EMERGENCY a emergency message
diff --git a/examples/reader.js b/examples/reader.js
@@ -0,0 +1,13 @@
+
+/**
+ * Module dependencies.
+ */
+
+var Log = require('../lib/log')
+  , fs = require('fs')
+  , stream = fs.createReadStream(__dirname + '/file.log')
+  , log = new Log('debug', stream);
+
+log.on('line', function(line){
+  console.log(line);
+});;
diff --git a/lib/log.js b/lib/log.js
@@ -1,9 +1,15 @@
 
 /*!
-* Log.js
-* Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
-* MIT Licensed
-*/
+ * Log.js
+ * Copyright(c) 2010 TJ Holowaychuk <tj@vision-media.ca>
+ * MIT Licensed
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var EventEmitter = require('events').EventEmitter;
 
 /**
  * Initialize a `Loggeer` with the given log `level` defaulting
@@ -18,6 +24,7 @@ var Log = exports = module.exports = function Log(level, stream){
   if ('string' == typeof level) level = exports[level.toUpperCase()];
   this.level = level || exports.DEBUG;
   this.stream = stream || process.stdout;
+  if (stream.readable) this.read();
 };
 
 /**
@@ -89,7 +96,35 @@ exports.DEBUG = 7;
  */ 
 
 Log.prototype = {
-
+  
+  /**
+   * Start emitting "line" events.
+   *
+   * @api public
+   */
+  
+  read: function(){
+    var buf = ''
+      , self = this;
+    this.stream.setEncoding('ascii');
+    this.stream.on('data', function(chunk){
+      buf += chunk;
+      if ('\n' != buf[buf.length - 1]) return;
+      buf.split('\n').map(function(line){
+        if (!line.length) return;
+        var captures = line.match(/^\[([^\]]+)\] (\w+) (.*)/);
+        var obj = {
+            date: new Date(captures[1])
+          , level: exports[captures[2]]
+          , levelString: captures[2]
+          , msg: captures[3] 
+        };
+        self.emit('line', obj);
+      });
+      buf = '';
+    });
+  },
+  
   /**
    * Log output message.
    *
@@ -196,4 +231,10 @@ Log.prototype = {
   debug: function(msg){
     this.log('DEBUG', msg);
   }
-};
+};
+
+/**
+ * Inherit from `EventEmitter`.
+ */
+
+Log.prototype.__proto__ = EventEmitter.prototype;
