8 Commits

Author SHA1 Message Date
bcf33c718c 1.0.8 2019-05-22 12:47:38 +02:00
7a8ab962b4 fix(core): add sigkill with 10 second delay 2019-05-22 12:47:38 +02:00
29021a7ffe 1.0.7 2019-05-19 22:23:38 +02:00
ca473dcd2e fix(core): update 2019-05-19 22:23:38 +02:00
b0b32fd730 1.0.6 2019-05-19 22:23:18 +02:00
924309ea8e fix(core): update 2019-05-19 22:23:17 +02:00
18928310e7 1.0.5 2019-05-19 22:12:21 +02:00
1451da7aba fix(core): update 2019-05-19 22:12:21 +02:00
5 changed files with 52 additions and 27 deletions

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/smartexit", "name": "@pushrocks/smartexit",
"version": "1.0.4", "version": "1.0.8",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "@pushrocks/smartexit", "name": "@pushrocks/smartexit",
"version": "1.0.4", "version": "1.0.8",
"private": false, "private": false,
"description": "do things before one exists a process", "description": "do things before one exists a process",
"main": "dist/index.js", "main": "dist/index.js",
@ -21,6 +21,7 @@
"tslint-config-prettier": "^1.15.0" "tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/lik": "^3.0.5" "@pushrocks/lik": "^3.0.5",
"@pushrocks/smartdelay": "^2.0.3"
} }
} }

View File

@ -1,8 +1,10 @@
import { expect, tap } from '@pushrocks/tapbundle'; import { expect, tap } from '@pushrocks/tapbundle';
import * as smartexit from '../ts/index'; import * as smartexit from '../ts/index';
let testSmartexit: smartexit.SmartExit;
tap.test('first test', async () => { tap.test('first test', async () => {
smartexit; testSmartexit = new smartexit.SmartExit();
}); });
tap.test('should end processes upon SIGINT', async tools => { tap.test('should end processes upon SIGINT', async tools => {

View File

@ -1,40 +1,61 @@
import * as plugins from './smartexit.plugins'; import * as plugins from './smartexit.plugins';
export class SmartExit { export class SmartExit {
public static processesToEnd = new plugins.lik.Objectmap<plugins.childProcess.ChildProcess>(); public processesToEnd = new plugins.lik.Objectmap<plugins.childProcess.ChildProcess>();
public static async addProcess(childProcessArg: plugins.childProcess.ChildProcess) {
SmartExit.processesToEnd.add(childProcessArg); /**
* adds a process to be exited
* @param childProcessArg
*/
public addProcess(childProcessArg: plugins.childProcess.ChildProcess) {
this.processesToEnd.add(childProcessArg);
} }
public static async killAll() { /**
* removes a process to be exited
*/
public removeProcess(childProcessArg: plugins.childProcess.ChildProcess) {
this.processesToEnd.remove(childProcessArg);
}
public async killAll() {
console.log('Checking for remaining child processes before exit...'); console.log('Checking for remaining child processes before exit...');
if (this.processesToEnd.getArray().length > 0) { if (this.processesToEnd.getArray().length > 0) {
console.log('found remaining child processes'); console.log('found remaining child processes');
let counter = 1; let counter = 1;
SmartExit.processesToEnd.forEach(async childProcessArg => { this.processesToEnd.forEach(async childProcessArg => {
console.log(`killing process #${counter}`); console.log(`killing process #${counter}`);
plugins.smartdelay.delayFor(10000).then(() => {
if (childProcessArg.killed) {
return;
}
childProcessArg.kill('SIGKILL');
})
childProcessArg.kill('SIGINT'); childProcessArg.kill('SIGINT');
counter++; counter++;
}); });
} else { } else {
console.log(`Everything looks clean. Ready to exit!`); console.log(`Everything looks clean. Ready to exit!`);
} }
} }
}
constructor() {
// do app specific cleaning before exiting // do app specific cleaning before exiting
process.on('exit', async () => { process.on('exit', async () => {
await SmartExit.killAll(); await this.killAll();
}); });
// catch ctrl+c event and exit normally // catch ctrl+c event and exit normally
process.on('SIGINT', async () => { process.on('SIGINT', async () => {
console.log('Ctrl-C...'); console.log('Ctrl-C...');
await SmartExit.killAll(); await this.killAll();
}); });
//catch uncaught exceptions, trace, then exit normally //catch uncaught exceptions, trace, then exit normally
process.on('uncaughtException', async err => { process.on('uncaughtException', async err => {
console.log('Ctrl-C...'); console.log('Ctrl-C...');
await SmartExit.killAll(); await this.killAll();
}); });
}
}

View File

@ -5,5 +5,6 @@ export { childProcess };
// pushrocks scope // pushrocks scope
import * as lik from '@pushrocks/lik'; import * as lik from '@pushrocks/lik';
import * as smartdelay from '@pushrocks/smartdelay';
export { lik }; export { lik, smartdelay };