resolving #44 and reverting to default filename concatenation unless default datePattern/prepend:true option is used

Author: Matt Berther

index.js

@@ -69,7 +69,7 @@ var DailyRotateFile = module.exports = function (options) {
   this.prettyPrint = options.prettyPrint || false;
   this.showLevel = options.showLevel === undefined ? true : options.showLevel;
   this.timestamp = options.timestamp ? options.timestamp : true;
-  this.datePattern = options.datePattern ? options.datePattern : 'yyyy-MM-dd';
+  this.datePattern = options.datePattern ? options.datePattern : '.yyyy-MM-dd';
   this.depth = options.depth || null;
   this.eol = options.eol || os.EOL;
   this.maxRetries = options.maxRetries || 2;
@@ -598,17 +598,18 @@ DailyRotateFile.prototype._getFile = function (inc) {
 // Returns the log filename depending on `this.prepend` option value
 //
 DailyRotateFile.prototype._getFilename = function () {
-  if (this.datePattern.substring(0, 1) === '.') {
-    this.datePattern = this.datePattern.substring(1);
-  }
-
   var formattedDate = this.getFormattedDate();
 
   if (this.prepend) {
-    return [formattedDate, this._basename].join('.');
+    if (this.datePattern === '.yyyy-MM-dd') {
+      this.datePattern = 'yyyy-MM-dd.';
+      formattedDate = this.getFormattedDate();
+    }
+
+    return formattedDate + this._basename;
   }
 
-  return [this._basename, formattedDate].join('.');
+  return this._basename + formattedDate;
 };
 
 //

test/simple.tests.js

@@ -61,6 +61,16 @@ describe('winston/transports/daily-rotate-file', function () {
         expect(transport._getFilename()).to.equal('prepend-false.log.' + now);
       });
 
+      it('should not add leading dot if one is not provided with datePattern', function () {
+        var now = moment().format('YYYY-MM-DD');
+        var transport = new DailyRotateFile({
+          filename: path.join(fixturesDir, 'log'),
+          datePattern: '-yyyy-MM-dd.log'
+        });
+
+        expect(transport._getFilename()).to.equal('log-' + now + '.log');
+      });
+
       it('should remove leading dot if one is provided with datePattern when prepend option is true', function () {
         var now = moment().format('YYYY-MM-DD');
         var transport = new DailyRotateFile({