From 5d3a4715f1bcf5aedab52cc698df7a7f3d59080a Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Mon, 18 Nov 2013 08:32:15 +0000
Subject: [PATCH] refactor(socket) getExec, getSpawn

---
 lib/server/socket.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/server/socket.js b/lib/server/socket.js
index bdad9fe3..caf20c4b 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -151,7 +151,12 @@
                 }
                 
                 if(!ClientFuncs[pConnNum])
-                    ClientFuncs[pConnNum] = getExec(pSocket, pConnNum);
+                    ClientFuncs[pConnNum] = getExec(function(json, pError, pStderr) {
+                        log(pConnNum, pError, 'error');
+                        log(pConnNum, pStderr, 'stderror');
+                        
+                        jsonSend(pSocket, json);
+                    });
                 
                 lExec_func      = ClientFuncs[pConnNum];
                 lExecSymbols    = ['*', '&', '{', '}', '|', '\'', '"'];
@@ -171,7 +176,9 @@
                 } else if (firstChar === ' ' || isContain)
                     exec(pCommand, lExec_func);
                 else
-                    getSpawn(pSocket, pConnNum, pCommand);
+                    getSpawn(pCommand, function(json) {
+                        jsonSend(pSocket, json);
+                    });
             }
         };
     }
@@ -181,7 +188,7 @@
      * function send result of command to client
      * @param pSocket
      */
-    function getExec(pSocket, pConnNum) {
+    function getExec(callback) {
         return function(pError, pStdout, pStderr) {
             var lErrorStr, lExecStr, lExec,
                 lError          = pStderr || pError;
@@ -200,14 +207,11 @@
                 stderr : lErrorStr || lError
             };
             
-            log(pConnNum, pError, 'error');
-            log(pConnNum, pStderr, 'stderror');
-            
-            jsonSend(pSocket, lExec);
+            Util.exec(callback, lExec, pError, pStderr);
         };
     }
     
-    function getSpawn(pSocket, pConnNum, pCommand) {
+    function getSpawn(pCommand, callback) {
         var send, cmd, spawn,
             args    = pCommand.split(' ');
         
@@ -224,7 +228,7 @@
             else
                 lExec.stdout    = msg;
             
-            jsonSend(pSocket, lExec);
+            Util.exec(callback, lExec);
         };
         
         cmd.stdout.on('data', send);