Working date rolling file stream

lib/streams/BaseRollingFileStream.js

@@ -2,18 +2,20 @@ var fs = require('fs'),
     util = require('util');
 
 function debug(message) {
-//    util.debug(message);
 //    console.log(message);
 }
 
 module.exports = BaseRollingFileStream;
 
 function BaseRollingFileStream(filename, options) {
+
+debug("In BaseRollingFileStream");
     this.filename = filename;
     this.options = options || { encoding: 'utf8', mode: 0644, flags: 'a' };
     this.rolling = false;
     this.writesWhileRolling = [];
     this.currentSize = 0;
+    this.rollBeforeWrite = false;
 
     function currentFileSize(file) {
         var fileSize = 0;
@@ -32,7 +34,7 @@ function BaseRollingFileStream(filename, options) {
     }
 
     throwErrorIfArgumentsAreNotValid();
-
+debug("Calling BaseRollingFileStream.super");
     BaseRollingFileStream.super_.call(this, this.filename, this.options);
     this.currentSize = currentFileSize(this.filename);
 }
@@ -67,18 +69,24 @@ BaseRollingFileStream.prototype.initRolling = function() {
 };
 
 BaseRollingFileStream.prototype.write = function(data, encoding) {
+    var canWrite = false;
     if (this.rolling) {
         this.writesWhileRolling.push({ data: data, encoding: encoding });
-        return false;
     } else {
-        var canWrite = BaseRollingFileStream.super_.prototype.write.call(this, data, encoding);
-        this.currentSize += data.length;
-        debug('current size = ' + this.currentSize);
-        if (this.shouldRoll()) {
+        if (this.rollBeforeWrite && this.shouldRoll()) {
+            this.writesWhileRolling.push({ data: data, encoding: encoding });
             this.initRolling();
+        } else {
+            canWrite = BaseRollingFileStream.super_.prototype.write.call(this, data, encoding);
+            this.currentSize += data.length;
+            debug('current size = ' + this.currentSize);
+
+            if (!this.rollBeforeWrite && this.shouldRoll()) {
+                this.initRolling();
+            }
         }
-        return canWrite;
     }
+    return canWrite;
 };
 
 BaseRollingFileStream.prototype.shouldRoll = function() {

lib/streams/DateRollingFileStream.js

@@ -1,16 +1,89 @@
 var BaseRollingFileStream = require('./BaseRollingFileStream'),
+    format = require('../date_format'),
+    async = require('async'),
+    fs = require('fs'),
     util = require('util');
 
 module.exports = DateRollingFileStream;
 
-function DateRollingFileStream(filename, pattern, options) {
-    if (typeof(pattern) === 'object') {
+function debug(message) {
+//    console.log(message);
+}
+
+function DateRollingFileStream(filename, pattern, options, now) {
+    debug("Now is " + now);
+    if (pattern && typeof(pattern) === 'object') {
+        now = options;
         options = pattern;
         pattern = null;
     }
-    this.pattern = pattern || 'yyyy-mm-dd';
+    this.pattern = pattern || '.yyyy-MM-dd';
+    this.now = now || Date.now;
+    this.lastTimeWeWroteSomething = format.asString(this.pattern, new Date(this.now()));
+    debug("this.now is " + this.now + ", now is " + now);
 
     DateRollingFileStream.super_.call(this, filename, options);
+    this.rollBeforeWrite = true;
 }
 
 util.inherits(DateRollingFileStream, BaseRollingFileStream);
+
+DateRollingFileStream.prototype.shouldRoll = function() {
+    var lastTime = this.lastTimeWeWroteSomething,
+        thisTime = format.asString(this.pattern, new Date(this.now()));
+
+    debug("DateRollingFileStream.shouldRoll with now = " + this.now() + ", thisTime = " + thisTime + ", lastTime = " + lastTime);
+
+    this.lastTimeWeWroteSomething = thisTime;
+    this.previousTime = lastTime;
+
+    return thisTime !== lastTime;
+};
+
+DateRollingFileStream.prototype.roll = function(filename, callback) {
+    var that = this,
+        newFilename = filename + this.previousTime;
+
+    debug("Starting roll");
+    debug("Queueing up data until we've finished rolling");
+    debug("Flushing underlying stream");
+    this.flush();
+
+    async.series([
+        deleteAnyExistingFile,
+        renameTheCurrentFile,
+        openANewFile
+    ], callback);
+
+    function deleteAnyExistingFile(cb) {
+        //on windows, you can get a EEXIST error if you rename a file to an existing file
+        //so, we'll try to delete the file we're renaming to first
+        fs.unlink(newFilename, function (err) {
+            //ignore err: if we could not delete, it's most likely that it doesn't exist
+            cb();
+        });
+    }
+
+    function renameTheCurrentFile(cb) {
+        debug("Renaming the " + filename + " -> " + newFilename);
+        fs.rename(filename, newFilename, cb);
+    }
+
+    function openANewFile(cb) {
+        debug("Opening a new file");
+        fs.open(
+            filename,
+            that.options.flags,
+            that.options.mode,
+            function (err, fd) {
+                debug("opened new file");
+                var oldLogFileFD = that.fd;
+                that.fd = fd;
+                that.writable = true;
+                fs.close(oldLogFileFD, cb);
+            }
+        );
+    }
+
+
+};