ensure that the logger is initialized with correct args before using …

…it (fix #2308)
appium · Apr 11, 2014 · 4cd36c8 · 4cd36c8
1 parent 45a2529
commit 4cd36c8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,4 +1,5 @@
 "use strict";
+
 var path = require('path')
   , gruntHelpers = require('./grunt-helpers.js')
   , authorize = gruntHelpers.authorize

diff --git a/bin/appium-doctor.js b/bin/appium-doctor.js
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 "use strict";
+
 var IOSChecker = require('../lib/doctor/ios.js').IOSChecker
   , AndroidChecker = require('../lib/doctor/android.js').AndroidChecker
   , DevChecker = require('../lib/doctor/dev.js').DevChecker

diff --git a/lib/server/logger.js b/lib/server/logger.js
@@ -21,7 +21,7 @@ var colors = {
 var logger = null;
 
 module.exports.init = function (args) {
-  var options = _.extend(defaults, {
+  var options = _.extend(_.clone(defaults), {
     timestamp: args.logTimestamp
   , handleExceptions: true
   , exitOnError: false

diff --git a/lib/server/main.js b/lib/server/main.js
@@ -5,7 +5,6 @@ var parser = require('./parser.js')()
   , args = null
   , fs = require('fs')
   , path = require('path')
-  , isWindows = require('../helpers.js').isWindows()
   , _ = require('underscore')
   , colors = require('colors');
 
@@ -20,6 +19,7 @@ logger = logFactory.get('appium');
 
 var appiumPermStat = fs.statSync(path.resolve(__dirname, '../../package.json'));
 var launchCmd = (process.env.SUDO_COMMAND || "").toLowerCase();
+var isWindows = require('../helpers.js').isWindows();
 
 if (
   !isWindows &&