From 8f85326cf33e6a2edd648902775b36610a33e6b3 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 24 Oct 2013 09:10:56 +0000 Subject: [PATCH] refactor(socket) getExec --- lib/server/socket.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/server/socket.js b/lib/server/socket.js index 2fda5dba..0c66a6ce 100644 --- a/lib/server/socket.js +++ b/lib/server/socket.js @@ -211,18 +211,15 @@ function getExec(pSocket, pConnNum) { return function(pError, pStdout, pStderr) { var lErrorStr, lExecStr, lExec, - lError = pStderr || pError; + lError = pError || pStderr; - if (lError) - if ( Util.isString(lError) ) - lErrorStr = lError; - else - lErrorStr = Util.stringifyJSON( lError ); + if (!Util.isString(lError)) + lErrorStr = lError.toString() + '\n'; lExec = { stdout : pStdout, - stderr : lError + stderr : lErrorStr || lError }; lExecStr = JSON.stringify(lExec);