Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 18:55:26 +00:00
Code Issues Projects Releases Wiki Activity

refactor(socket) getExec, getSpawn

Browse source
This commit is contained in:
coderaiser 2013-11-18 08:32:15 +00:00
parent 9cb375fcef
commit 5d3a4715f1
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/server/socket.js
View file

@ -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);