diff --git a/lib/server/console.js b/lib/server/console.js index 031fbca3..b897f660 100644 --- a/lib/server/console.js +++ b/lib/server/console.js @@ -204,6 +204,7 @@ function getSpawn(сommand, options, callback) { var cmd, error, + addNewLine = CloudFunc.addNewLine, args = сommand.split(' '), send = function(error, data) { var exec = { @@ -212,6 +213,12 @@ }; Util.exec(callback, exec); + }, + sendError = function(error) { + var errorStr = addNewLine(error + ''); + + Util.log(error); + send(errorStr, null); }; сommand = args.shift(); @@ -220,18 +227,16 @@ cmd = spawn(сommand, args, options); }); - if (!cmd) - send(error + '\n', null); - else { + if (error) { + sendError(error); + } else { cmd.stdout.on('data', function(data) { send(null, data + ''); }); - cmd.stderr.on('data', function(error) { - send(error + '', null); - }); + cmd.stderr.on('data', sendError); + cmd.on('error', sendError); - cmd.on('error', Util.retFalse); cmd.on('close', function () { cmd = null; });