coolaj86
/
telebit.js
1
2
Fork 1
Code Issues 46 Pull Requests 2 Releases Activity

move killAll to own function

This commit is contained in:
AJ ONeal 2018-07-28 02:14:23 -06:00
parent 3be8c28421
commit e1cfecfefc
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
usr/share/install-launcher.js
View File

@ -7,6 +7,24 @@ var exec = require('child_process').exec;
var path = require('path'); var path = require('path');
var Launcher = module.exports; var Launcher = module.exports;
Launcher._killAll = function (fn) {
var psList = require('ps-list');
psList().then(function (procs) {
procs.forEach(function (proc) {
if ('node' === proc.name && /\btelebitd\b/i.test(proc.cmd)) {
console.log(proc);
process.kill(proc.pid);
return true;
}
});
// Two things:
// 1) wait to see if the process dies
// 2) wait to give time for the socket to connect
setTimeout(function () {
if (fn) { fn(null); return; }
}, 1.75 * 1000);
});
};
Launcher._getError = function getError(err, stderr) { Launcher._getError = function getError(err, stderr) {
if (err) { return err; } if (err) { return err; }
if (stderr) { if (stderr) {
@ -315,22 +333,7 @@ Launcher.uninstall = function (things, fn) {
vars.userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false; vars.userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false;
var launchers = { var launchers = {
'node': function () { 'node': function () {
var psList = require('ps-list'); Launcher._killAll(fn);
psList().then(function (procs) {
procs.forEach(function (proc) {
if ('node' === proc.name && /telebitd/i.test(proc.cmd)) {
console.log(proc);
process.kill(proc.pid);
return true;
}
});
// Two things:
// 1) wait to see if the process dies
// 2) wait to give time for the socket to connect
setTimeout(function () {
if (fn) { fn(null); return; }
}, 1.75 * 1000);
});
} }
, 'launchctl': function () { , 'launchctl': function () {
var launcher = path.join(os.homedir(), 'Library/LaunchAgents/cloud.telebit.remote.plist'); var launcher = path.join(os.homedir(), 'Library/LaunchAgents/cloud.telebit.remote.plist');