Merge pull request #578 from nimrod-becker/master

Issue #566 maxFiles doesn't seem to behave as expected
winstonjs · Mar 16, 2015 · 8ba9be0 · 8ba9be0
2 parents 7657b9f + a300bbe
commit 8ba9be0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/lib/winston/transports/file.js b/lib/winston/transports/file.js
@@ -555,7 +555,7 @@ File.prototype._checkMaxFilesIncrementing = function (ext, basename, callback) {
   }
 
   oldest = this._created - this.maxFiles;
-  target = path.join(this.dirname, basename + (oldest === 0 ? oldest : '') + ext);
+  target = path.join(this.dirname, basename + (oldest !== 0 ? oldest : '') + ext);
   fs.unlink(target, callback);
 };
 

diff --git a/test/transports/file-maxfiles-test.js b/test/transports/file-maxfiles-test.js
@@ -23,7 +23,7 @@ var maxfilesTransport = new winston.transports.File({
   maxsize: 4096,
   maxFiles: 3
 });
-    
+
 vows.describe('winston/transports/file/maxfiles').addBatch({
   "An instance of the File Transport": {
     "when passed a valid filename": {
@@ -43,48 +43,48 @@ vows.describe('winston/transports/file/maxfiles').addBatch({
         topic: function () {
           var that = this,
               created = 0;
-              
+
           function data(ch) {
             return new Array(1018).join(String.fromCharCode(65 + ch));
           };
-      
+
           function logKbytes(kbytes, txt) {
             //
             // With no timestamp and at the info level,
-            // winston adds exactly 7 characters: 
+            // winston adds exactly 7 characters:
             // [info](4)[ :](2)[\n](1)
             //
             for (var i = 0; i < kbytes; i++) {
               maxfilesTransport.log('info', data(txt), null, function () { });
             }
           }
-          
+
           maxfilesTransport.on('logged', function () {
             if (++created === 6) {
               return that.callback();
             }
-            
+
             logKbytes(4, created);
           });
-         
+
           logKbytes(4, created);
         },
         "should be only 3 files called 5.log, 4.log and 3.log": function () {
           for (var num = 0; num < 6; num++) {
             var file = !num ? 'testmaxfiles.log' : 'testmaxfiles' + num + '.log',
                 fullpath = path.join(__dirname, '..', 'fixtures', 'logs', file);
-            
+
             // There should be no files with that name
             if (num >= 0 && num < 3) {
-              return assert.throws(function () {
-                fs.statSync(file);
+              assert.throws(function () {
+                fs.statSync(fullpath);
               }, Error);
-            } 
-
-            // The other files should be exist
-            assert.doesNotThrow(function () {
-              fs.statSync(file);
-            }, Error);
+            } else {
+              // The other files should be exist
+              assert.doesNotThrow(function () {
+                fs.statSync(fullpath);
+              }, Error);
+            }
           }
         },
         "should have the correct content": function () {
@@ -99,4 +99,4 @@ vows.describe('winston/transports/file/maxfiles').addBatch({
       }
     }
   }
-}).export(module);
+}).export(module);