From 88a23f4d5a03347219f0cafd629229fc071e6ff0 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Wed, 27 Aug 2014 06:29:02 -0400
Subject: [PATCH] feature(spawnify) callback: json -> error, json

---
 lib/server/console.js  |  6 +++---
 lib/server/spawnify.js | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/server/console.js b/lib/server/console.js
index 148c932a..39bfb0a4 100644
--- a/lib/server/console.js
+++ b/lib/server/console.js
@@ -21,7 +21,7 @@
     
     module.exports = function() {
         socket.on('connection', function(clientSocket) {
-            onConnection(clientSocket, function(json) {
+            onConnection(clientSocket, function(error, json) {
                 socket.emit(CHANNEL, json, clientSocket);
             });
         });
@@ -37,7 +37,7 @@
         if (!Clients[ConNum]) {
             msg = log(ConNum, 'console connected');
             
-            callback({
+            callback(null, {
                 stdout  : addNewLine(msg),
                 path    : CWD
             });
@@ -64,7 +64,7 @@
         } else {
             msg = log(ConNum, ' in use. Reconnecting...\n');
             
-            callback({
+            callback(null, {
                 stdout: msg
             });
             
diff --git a/lib/server/spawnify.js b/lib/server/spawnify.js
index db1871da..ba3ae7b5 100644
--- a/lib/server/spawnify.js
+++ b/lib/server/spawnify.js
@@ -58,12 +58,12 @@
             onCD(command, dir, function(error, json) {
                 var path;
                 
-                if (json.path) {
+                if (!error && json.path) {
                     path        = json.path;
                     options.cwd = path;
                 }
                 
-                callback(json);
+                callback(error, json);
             });
         }
         
@@ -108,7 +108,7 @@
             stderr : errorStr
         };
         
-        callback(json, error, stderr);
+        callback(error, json);
     }
     
     function setSpawn(сommand, options, callback) {
@@ -119,8 +119,6 @@
                 var errorStr = '';
                 
                 isSended = true;
-                callback(error, stdout, stderr);
-            
                 if (error)
                     errorStr = error.message;
                 else if (stderr)
@@ -128,7 +126,7 @@
                 
                 errorStr = addNewLine(errorStr);
                 
-                callback({
+                callback(error, {
                     stderr: errorStr,
                     stdout: stdout
                 });
@@ -148,7 +146,7 @@
         });
         
         if (error) {
-            callback(error);
+            func(error);
         } else {
             cmd.stderr.setEncoding('utf8');
             cmd.stdout.setEncoding('utf8');
@@ -200,7 +198,7 @@
                     path        = '';
                 }
                 
-                callback(error || stderr, {
+                callback(error, {
                     stderr  : addNewLine(errorStr),
                     stdout  : stdout,
                     path    : path