make instruments use same logger as appium

app/appium.js

@@ -149,7 +149,7 @@ Appium.prototype.invoke = function() {
     // in future all the blackberries go here.
     this.active = 'iOS';
     if (typeof this.devices[this.active] === 'undefined') {
-      this.devices[this.active] = ios(this.rest, this.args.app, this.args.udid, this.args.verbose, this.args.remove);
+      this.devices[this.active] = ios(this.rest, this.args.app, this.args.udid, this.args.verbose, this.args.remove, this.args.logFile);
     }
     this.device = this.devices[this.active];
 

instruments/instruments.js

@@ -2,8 +2,7 @@
 "use strict";
 
 var spawn = require('child_process').spawn
-  , colors = require('colors')
-  , logger = require('../logger').get('instruments')
+  , logger = require('../logger').get('appium')
   , fs = require('fs')
   , _ = require('underscore')
   , net = require('net')

logger.js

@@ -6,24 +6,22 @@ var winston = require('winston')
         new winston.transports.Console({
           handleExceptions: true
           , json: false
-          , level: 'rest'
+          , level: 'debug'
           , exitOnError: false
         })
       ]
     };
 
 winston.loggers.add('appium', options);
-winston.loggers.add('instruments', options);
-winston.loggers.get('appium').setLevels({
-  rest: 0
-  , debug: 1
+var levels = {
+  debug: 1
   , info: 2
   , warn: 3
   , error: 4
-});
+};
+winston.loggers.get('appium').setLevels(levels);
 winston.addColors({
   info: 'cyan'
-  , rest: 'grey'
   , debug: 'grey'
   , warn: 'yellow'
   , error: 'error'
@@ -34,10 +32,11 @@ module.exports.get = function(name) {
 };
 
 module.exports.setLogFile = function(logger, filename) {
+  console.log("Setting log file for logger");
   logger.add(winston.transports.File, {
     filename: filename
     , colorize: false
-    , level: 'rest'
+    , level: 'debug'
     , maxsize: 1000000
     , maxFiles: 4
     , json: false

server.js

@@ -27,7 +27,7 @@ var main = function(args, readyCb, doneCb) {
         write: function(msg) {
           msg = msg.replace(/$\s*$/m, "");
           msg = msg.replace(/\[[^\]]+\] /, "");
-          logger.log('rest', msg);
+          logger.log('debug', msg);
         }
       };
       rest.use(express.logger({stream: winstonStream}));