gabehf/Tdarr_Plugins
1
0
Fork 0
mirror of https://github.com/gabehf/Tdarr_Plugins.git synced 2026-03-14 09:45:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Kill flow subthread on worker exit

Browse source
This commit is contained in:
HaveAGitGat 2023-12-07 06:43:03 +00:00
parent c7e22c9648
commit 3333d2a10c
1 changed files with 37 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

41
FlowPluginsTs/FlowHelpers/1.0.0/cliUtils.ts
View file

@ -241,6 +241,30 @@ class CLI {
} }
}; };
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/explicit-module-boundary-types
killThread = (thread:any): void => {
const killArray = [
'SIGKILL',
'SIGHUP',
'SIGTERM',
'SIGINT',
];
try {
thread.kill();
} catch (err) {
// err
}
killArray.forEach((com: string) => {
try {
thread.kill(com);
} catch (err) {
// err
}
});
}
runCli = async (): Promise<{ runCli = async (): Promise<{
cliExitCode: number, cliExitCode: number,
errorLogFull: string[], errorLogFull: string[],
@ -249,7 +273,6 @@ class CLI {
const errorLogFull: string[] = []; const errorLogFull: string[] = [];
// eslint-disable-next-line no-console
this.config.jobLog(`Running ${this.config.cli} ${this.config.spawnArgs.join(' ')}`); this.config.jobLog(`Running ${this.config.cli} ${this.config.spawnArgs.join(' ')}`);
const cliExitCode: number = await new Promise((resolve) => { const cliExitCode: number = await new Promise((resolve) => {
try { try {
@ -257,16 +280,26 @@ class CLI {
const spawnArgs = this.config.spawnArgs.map((row) => row.trim()).filter((row) => row !== ''); const spawnArgs = this.config.spawnArgs.map((row) => row.trim()).filter((row) => row !== '');
const thread = childProcess.spawn(this.config.cli, spawnArgs, opts); const thread = childProcess.spawn(this.config.cli, spawnArgs, opts);
process.on('exit', () => {
try {
// eslint-disable-next-line no-console
console.log('Main thread exiting, cleaning up running CLI');
this.killThread(thread);
} catch (err) {
// eslint-disable-next-line no-console
console.log('Error running cliUtils on Exit function');
// eslint-disable-next-line no-console
console.log(err);
}
});
thread.stdout.on('data', (data: string) => { thread.stdout.on('data', (data: string) => {
// eslint-disable-next-line no-console
// console.log(data.toString());
errorLogFull.push(data.toString()); errorLogFull.push(data.toString());
this.parseOutput(data); this.parseOutput(data);
}); });
thread.stderr.on('data', (data: string) => { thread.stderr.on('data', (data: string) => {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
// console.log(data.toString());
errorLogFull.push(data.toString()); errorLogFull.push(data.toString());
this.parseOutput(data); this.parseOutput(data);
}); });