diff --git a/lib/server/console.js b/lib/server/console.js index fc58aa6d..cb7e416b 100644 --- a/lib/server/console.js +++ b/lib/server/console.js @@ -53,8 +53,12 @@ var ret; ret = socket.on('connection', function(clientSocket) { - onConnection(clientSocket, function(json) { + onConnection(clientSocket, function(json, all) { var msg = Util.stringifyJSON(json); + + if (all) + socket.send(msg, clientSocket, 'message', all); + socket.send(msg, clientSocket); }); }); @@ -171,7 +175,7 @@ Util.exec(callback, { stdout: pCommand - }); + }, true); } else if (WIN32 || firstChar === ' ' || isContain) exec(pCommand, options, lExec_func); else diff --git a/lib/server/socket.js b/lib/server/socket.js index 74f04f0c..2a507f7e 100644 --- a/lib/server/socket.js +++ b/lib/server/socket.js @@ -26,8 +26,11 @@ CloudFunc.removeListener(name, func, AllListeners, socket); } - function send(msg, clientSocket) { - clientSocket.send(msg); + function send(msg, clientSocket, channel, all) { + if (all && channel) + clientSocket.broadcast.emit(channel, msg); + else + clientSocket.send(msg); } /**