Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-05-31 20:25:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: shutdown api process when another worker exits unexpectedly (#13802)

Browse Source
This commit is contained in:
Zack Pollard 2024-10-29 14:46:04 +00:00 committed by GitHub
parent 02819dc079
commit e74ddca6c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/main.ts
View File

@ -1,5 +1,5 @@
import { CommandFactory } from 'nest-commander'; import { CommandFactory } from 'nest-commander';
import { fork } from 'node:child_process'; import { ChildProcess, fork } from 'node:child_process';
import { Worker } from 'node:worker_threads'; import { Worker } from 'node:worker_threads';
import { ImmichAdminModule } from 'src/app.module'; import { ImmichAdminModule } from 'src/app.module';
import { ImmichWorker, LogLevel } from 'src/enum'; import { ImmichWorker, LogLevel } from 'src/enum';
@ -10,12 +10,16 @@ if (immichApp) {
process.argv.splice(2, 1); process.argv.splice(2, 1);
} }
let apiProcess: ChildProcess | undefined;
function bootstrapWorker(name: ImmichWorker) { function bootstrapWorker(name: ImmichWorker) {
console.log(`Starting ${name} worker`); console.log(`Starting ${name} worker`);
const execArgv = process.execArgv.map((arg) => (arg.startsWith('--inspect') ? '--inspect=0.0.0.0:9231' : arg)); const execArgv = process.execArgv.map((arg) => (arg.startsWith('--inspect') ? '--inspect=0.0.0.0:9231' : arg));
const worker = const worker =
name === 'api' ? fork(`./dist/workers/${name}.js`, [], { execArgv }) : new Worker(`./dist/workers/${name}.js`); name === ImmichWorker.API
? (apiProcess = fork(`./dist/workers/${name}.js`, [], { execArgv }))
: new Worker(`./dist/workers/${name}.js`);
worker.on('error', (error) => { worker.on('error', (error) => {
console.error(`${name} worker error: ${error}`); console.error(`${name} worker error: ${error}`);
@ -24,6 +28,10 @@ function bootstrapWorker(name: ImmichWorker) {
worker.on('exit', (exitCode) => { worker.on('exit', (exitCode) => {
if (exitCode !== 0) { if (exitCode !== 0) {
console.error(`${name} worker exited with code ${exitCode}`); console.error(`${name} worker exited with code ${exitCode}`);
if (apiProcess && name !== ImmichWorker.API) {
console.error('Killing api process');
apiProcess.kill('SIGTERM');
}
process.exit(exitCode); process.exit(exitCode);
} }
}); });