Merge branch 'master' of git://github.com/stefanheine/winston-daily-rotate-file into stefanheine-master

# Conflicts:
#	index.js

Author: Matt Berther

README.md

@@ -10,10 +10,10 @@
   winston.add(require('winston-daily-rotate-file'), options)
 ```
 
-The DailyRotateFile transport can rotate files by minute, hour, day, month or year. In addition to the options accepted by the File transport, the Daily Rotate File Transport also accepts the following options:
+The DailyRotateFile transport can rotate files by minute, hour, day, month, year or weekday. In addition to the options accepted by the File transport, the Daily Rotate File Transport also accepts the following options:
 
-* __datePattern:__ A string representing the pattern to be used when appending the date to the filename (default '.yyyy-MM-dd'). The meta characters used in this string will dictate the frequency of the file rotation. For example, if your datePattern is simply '.HH' you will end up with 24 log files that are picked up and appended to every day.
-* __prepend:__ Defines if the rolling time of the log file should be prepended at the begging of the filename (default `false`)
+* __datePattern:__ A string representing the pattern to be used when appending the date to the filename (default 'yyyy-MM-dd'). The meta characters used in this string will dictate the frequency of the file rotation. For example, if your datePattern is simply 'HH' you will end up with 24 log files that are picked up and appended to every day.
+* __prepend:__ Defines if the rolling time of the log file should be prepended at the beginning of the filename (default 'false').
 
 Valid meta characters in the datePattern are:
 
@@ -27,6 +27,7 @@ Valid meta characters in the datePattern are:
 * __HH:__ The zero padded hour.
 * __m:__ The minute.
 * __mm:__ The zero padded minute.
+* __ddd:__ The weekday (Mon, Tue, ..., Sun).
 
 *Metadata:* Logged via util.inspect(meta);
 

index.js

@@ -9,6 +9,8 @@ var Stream = require('stream').Stream;
 var os = require('os');
 var winston = require('winston');
 
+var weekday = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+
 //
 // ### function DailyRotateFile (options)
 // #### @options {Object} Options for this instance.
@@ -96,6 +98,7 @@ var DailyRotateFile = module.exports = function (options) {
   this._date = now.getUTCDate();
   this._hour = now.getUTCHours();
   this._minute = now.getUTCMinutes();
+  this._weekday = weekday[now.getUTCDay()];
 
   var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhM])\1?/g;
   var pad = function (val, len) {
@@ -118,7 +121,8 @@ var DailyRotateFile = module.exports = function (options) {
       H: this._hour,
       HH: pad(this._hour),
       m: this._minute,
-      mm: pad(this._minute)
+      mm: pad(this._minute),
+      ddd: this._weekday
     };
     return this.datePattern.replace(token, function ($0) {
       return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
@@ -554,6 +558,7 @@ DailyRotateFile.prototype._createStream = function () {
         self._date = now.getUTCDate();
         self._hour = now.getUTCHours();
         self._minute = now.getUTCMinutes();
+        self._weekday = weekday[now.getUTCDay()];
         self._created = 0;
         return checkFile(self._getFile());
       }

test/simple.tests.js

@@ -24,6 +24,15 @@ var transports = {
   'prepended file': new DailyRotateFile({
     filename: path.join(fixturesDir, 'testfilename.log'),
     prepend: true
+  }),
+  'weekday file': new DailyRotateFile({
+    filename: path.join(fixturesDir, 'testfilename_weekday'),
+    datePattern: '.ddd.log'
+  }),
+  'prepend weekday file': new DailyRotateFile({
+    filename: path.join(fixturesDir, 'testfilename_prepend_weekday.log'),
+    datePattern: 'ddd-',
+    prepend: true
   })
 };