Skip to content

Locked ps tree version to 1.1.1 #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 27, 2018
Merged

Locked ps tree version to 1.1.1 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1f22d5
Revert "Merge pull request #65 from yohan-pereira/remove_pstree"
punitx Nov 27, 2018
0c5043f
Locked ps-tree version to 1.1.1
punitx Nov 27, 2018
2c74310
Bumped package version to 1.3.7
punitx Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 36 additions & 41 deletions lib/Local.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ var childProcess = require('child_process'),
path = require('path'),
running = require('is-running'),
LocalBinary = require('./LocalBinary'),
LocalError = require('./LocalError');

LocalError = require('./LocalError'),
psTree = require('ps-tree');

function Local(){
this.pid = undefined;
this.isProcessRunning = false;
this.retriesLeft = 5;
this.key = process.env.BROWSERSTACK_ACCESS_KEY;
this.logfile = path.join(process.cwd(), 'local.log');
Expand Down Expand Up @@ -57,56 +58,20 @@ function Local(){
callback(new LocalError(data['message']['message']));
} else {
that.pid = data['pid'];
that.isProcessRunning = true;
callback();
}
});

// that.tunnel = childProcess.spawn(binaryPath, that.getBinaryArgs());
// that.tunnel.on('exit', function(){
// that.tunnel = undefined;
// if(that.exitCallback) that.exitCallback();
// });

// that.stdout = fs.openSync(that.logfile, 'r');
// var chunkSize = 512,
// buffer = new Buffer(81920),
// bytesRead = 0,
// error = undefined;

// while(true){
// var bytes = fs.readSync(that.stdout, buffer, bytesRead, chunkSize, bytesRead);
// if(bytes == 0) continue;

// var buffRead = buffer.slice(bytesRead, bytesRead+bytes);
// bytesRead += bytes;

// var data = buffRead.toString();

// if(data.match(that.errorRegex)){
// fs.closeSync(that.stdout);
// error = data.match(that.errorRegex)[0].trim();
// break;
// }

// if(data.match(that.doneRegex)){
// fs.closeSync(that.stdout);
// break;
// }
// }

// if(error) throw new LocalError(error);
// callback();
});
};

this.isRunning = function(){
return this.pid && running(this.pid);
return this.pid && running(this.pid) && this.isProcessRunning;
};

this.stop = function (callback) {
if(!this.pid) return callback();
this.opcode = 'stop';
this.tunnel = childProcess.execFile(this.binaryPath, this.getBinaryArgs(), function(error){
this.killAllProcesses(function(error){
if(error) callback(new LocalError(error.toString()));
callback();
});
Expand Down Expand Up @@ -287,5 +252,35 @@ function Local(){
}
return args;
};

this.killAllProcesses = function(callback){
psTree(this.pid, (err, children) => {
var childPids = children.map(val => val.PID);
var killChecker = setInterval(() => {
if(childPids.length === 0) {
clearInterval(killChecker);
try {
process.kill(this.pid);
// This gives time to local binary to send kill signal to railsApp.
setTimeout(() => {
this.isProcessRunning = false;
callback();
}, 2000);
} catch(err) {
this.isProcessRunning = false;
callback();
}
}
for(var i in childPids) {
try {
process.kill(childPids[i]);
} catch(err) {
childPids.splice(i, 1);
}
}
},500);
});
};
}

module.exports = Local;
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "browserstack-local",
"version": "1.3.6",
"version": "1.3.7",
"description": "Nodejs bindings for BrowserStack Local",
"engine": "^0.10.44",
"main": "index.js",
Expand All @@ -19,6 +19,7 @@
"dependencies": {
"https-proxy-agent": "^2.2.1",
"is-running": "^2.0.0",
"ps-tree": "=1.1.1",
"sinon": "^1.17.6",
"temp-fs": "^0.9.9"
},
Expand Down