From 4b9a0016c29294f35e8fbfc0a4196fecee65b530 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 24 Jan 2014 09:34:21 -0500 Subject: [PATCH] refactor(socket) getSpawn --- lib/server/socket.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/server/socket.js b/lib/server/socket.js index a85c9974..10ed8282 100644 --- a/lib/server/socket.js +++ b/lib/server/socket.js @@ -9,7 +9,10 @@ io = main.require('socket.io'), update = main.srvrequire('update'), + exec = main.child_process.exec, + spawn = main.child_process.spawn, + Util = main.util, path = main.path, mainpackage = main.mainpackage, @@ -236,12 +239,11 @@ } function getSpawn(pCommand, options, callback) { - var send, cmd, spawn, + var send, cmd, args = pCommand.split(' '); pCommand = args.shift(); - spawn = main.child_process.spawn; Util.tryCatchLog(function() { cmd = spawn(pCommand, args, options); }); @@ -249,19 +251,19 @@ if (cmd) { send = function(error, data) { var exec = { - stderr: error + '', - stdout: data + '' + stderr: error, + stdout: data }; Util.exec(callback, exec); }; cmd.stdout.on('data', function(data) { - send(null, data); + send(null, data + ''); }); cmd.stderr.on('data', function(error) { - send(error); + send(error + '', null); }); cmd.on('error', Util.retFalse);