update files

This commit is contained in:
nuintun 2015-12-03 19:22:43 +08:00
parent 53891db655
commit b82707608e
4 changed files with 136 additions and 145 deletions

View File

@ -69,4 +69,40 @@ function normalizeExecArgs(command, options){
};
}
module.exports = Emulator;
// thread
process.on('message', function (project){
var stream;
var emulator = new Emulator({
cwd: project.path,
command: project.command.value
});
stream = emulator.start();
stream.stdout.on('data', function (data){
process.send({
event: 'data',
project: project,
data: data.toString()
});
});
stream.stderr.on('data', function (error){
emulator.stop();
process.send({
event: 'error',
project: project,
data: error.toString()
});
});
stream.on('close', function (signal){
emulator.stop();
process.send({
event: 'close',
project: project,
data: signal.toString()
});
});
});

View File

@ -4,24 +4,24 @@
'use strict';
var cluster = require('cluster');
var path = require('path');
var ipc = require('ipc-main');
var fork = require('child_process').fork;
// cache
var workers = {};
var threads = {};
/**
* killWorker
* killThread
* @param name
*/
function killWorker(name){
var worker = workers[name];
function killThread(name){
var thread = threads[name];
if (worker && !worker.isDead()) {
worker.kill('SIGTERM');
if (thread && thread.connected) {
thread.kill('SIGTERM');
delete workers[name];
delete threads[name];
}
}
@ -29,11 +29,11 @@ module.exports = {
start: function (){
ipc.on('emulator', function (event, project, action){
var key = project.name + '-' + project.command.name;
var worker = workers[key];
var thread = threads[key];
switch (action) {
case 'start':
if (!worker || worker.isDead()) {
if (!thread || !thread.connected) {
var env = {};
Object.keys(process.env).forEach(function (key){
@ -44,29 +44,31 @@ module.exports = {
env[item.name] = item.value;
});
worker = cluster.fork(env);
thread = fork(path.join(__dirname, 'emulator'), {
env: env
});
worker.on('message', function (message){
thread.on('message', function (message){
event.sender.send('emulator', message.event, message.project, message.data);
});
worker.on('error', function (){
killWorker(project.name);
thread.on('error', function (){
killThread(project.name);
});
delete project.env;
worker.send(project);
thread.send(project);
workers[project.name] = worker;
threads[project.name] = thread;
} else {
delete project.env;
worker.send(project);
thread.send(project);
}
break;
case 'stop':
killWorker(project.name);
killThread(project.name);
break;
}
});

43
main.js
View File

@ -4,9 +4,6 @@
'use strict';
var cluster = require('cluster');
if (cluster.isMaster) {
// node module
var path = require('path');
// module to control application life
@ -95,43 +92,3 @@ if (cluster.isMaster) {
// emulator start
thread.start();
});
} else {
var Emulator = require('./bin/emulator');
process.on('message', function (project){
var stream;
var emulator = new Emulator({
cwd: project.path,
command: project.command.value
});
stream = emulator.start();
stream.stdout.on('data', function (data){
process.send({
event: 'data',
project: project,
data: data.toString()
});
});
stream.stderr.on('data', function (error){
emulator.stop();
process.send({
event: 'error',
project: project,
data: error.toString()
});
});
stream.on('close', function (signal){
emulator.stop();
process.send({
event: 'close',
project: project,
data: signal.toString()
});
});
});
}

View File

@ -494,7 +494,3 @@ header [class*=" icon-"] {
height: calc(100% - 32px);
background: url(../images/no-data.png) center no-repeat;
}
.ui-terminal-cursor {
background: #fff;
color: #181818;
}