more linting

lib/streams/RollingFileStream.js

@@ -1,88 +1,89 @@
-var BaseRollingFileStream = require('./BaseRollingFileStream'),
+"use strict";
-    util = require('util'),
+var BaseRollingFileStream = require('./BaseRollingFileStream')
-    path = require('path'),
+, util = require('util')
-    fs = require('fs'),
+, path = require('path')
-    async = require('async');
+, fs = require('fs')
+, async = require('async');
 
 var debug;
 if (process.env.NODE_DEBUG && /\blog4js\b/.test(process.env.NODE_DEBUG)) {
-    debug = function(message) { console.error('LOG4JS: (RollingFileStream) %s', message); };
+  debug = function(message) { console.error('LOG4JS: (RollingFileStream) %s', message); };
 } else {
-    debug = function() { };
+  debug = function() { };
 }
 
 module.exports = RollingFileStream;
 
 function RollingFileStream (filename, size, backups, options) {
-    this.size = size;
+  this.size = size;
-    this.backups = backups || 1;
+  this.backups = backups || 1;
-
+  
-    function throwErrorIfArgumentsAreNotValid() {
+  function throwErrorIfArgumentsAreNotValid() {
-        if (!filename || !size || size <= 0) {
+    if (!filename || !size || size <= 0) {
-            throw new Error("You must specify a filename and file size");
+      throw new Error("You must specify a filename and file size");
-        }
     }
-
+  }
-    throwErrorIfArgumentsAreNotValid();
+  
-
+  throwErrorIfArgumentsAreNotValid();
-    RollingFileStream.super_.call(this, filename, options);
+  
+  RollingFileStream.super_.call(this, filename, options);
 }
 util.inherits(RollingFileStream, BaseRollingFileStream);
 
 RollingFileStream.prototype.shouldRoll = function() {
   debug("should roll with current size %d, and max size %d", this.currentSize, this.size);
-    return this.currentSize >= this.size;
+  return this.currentSize >= this.size;
 };
 
 RollingFileStream.prototype.roll = function(filename, callback) {
-    var that = this,
+  var that = this,
-        nameMatcher = new RegExp('^' + path.basename(filename));
+  nameMatcher = new RegExp('^' + path.basename(filename));
-
+  
-    function justTheseFiles (item) {
+  function justTheseFiles (item) {
-        return nameMatcher.test(item);
+    return nameMatcher.test(item);
+  }
+  
+  function index(filename_) {
+    return parseInt(filename_.substring((path.basename(filename) + '.').length), 10) || 0;
+  }
+  
+  function byIndex(a, b) {
+    if (index(a) > index(b)) {
+      return 1;
+    } else if (index(a) < index(b) ) {
+      return -1;
+    } else {
+      return 0;
     }
+  }
 
-    function index(filename_) {
+  function increaseFileIndex (fileToRename, cb) {
-        return parseInt(filename_.substring((path.basename(filename) + '.').length), 10) || 0;
+    var idx = index(fileToRename);
+    debug('Index of ' + fileToRename + ' is ' + idx);
+    if (idx < that.backups) {
+      //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(filename + '.' + (idx+1), function (err) {
+        //ignore err: if we could not delete, it's most likely that it doesn't exist
+        debug('Renaming ' + fileToRename + ' -> ' + filename + '.' + (idx+1));
+        fs.rename(path.join(path.dirname(filename), fileToRename), filename + '.' + (idx + 1), cb);
+      });
+    } else {
+      cb();
     }
+  }
 
-    function byIndex(a, b) {
+  function renameTheFiles(cb) {
-        if (index(a) > index(b)) {
+    //roll the backups (rename file.n to file.n+1, where n <= numBackups)
-            return 1;
+    debug("Renaming the old files");
-        } else if (index(a) < index(b) ) {
+    fs.readdir(path.dirname(filename), function (err, files) {
-            return -1;
+      async.forEachSeries(
-        } else {
+        files.filter(justTheseFiles).sort(byIndex).reverse(),
-            return 0;
+        increaseFileIndex,
-        }
+        cb
-    }
+      );
-
+    });
-    function increaseFileIndex (fileToRename, cb) {
+  }
-        var idx = index(fileToRename);
-        debug('Index of ' + fileToRename + ' is ' + idx);
-        if (idx < that.backups) {
-            //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(filename + '.' + (idx+1), function (err) {
-                //ignore err: if we could not delete, it's most likely that it doesn't exist
-                debug('Renaming ' + fileToRename + ' -> ' + filename + '.' + (idx+1));
-                fs.rename(path.join(path.dirname(filename), fileToRename), filename + '.' + (idx + 1), cb);
-            });
-        } else {
-            cb();
-        }
-    }
-
-    function renameTheFiles(cb) {
-        //roll the backups (rename file.n to file.n+1, where n <= numBackups)
-        debug("Renaming the old files");
-        fs.readdir(path.dirname(filename), function (err, files) {
-            async.forEachSeries(
-                files.filter(justTheseFiles).sort(byIndex).reverse(),
-                increaseFileIndex,
-                cb
-            );
-        });
-    }
 
   debug("Rolling, rolling, rolling");
   async.series([