Skip to content

Commit 3935279

Browse files
kamilmysliwieckamilmysliwiec
committed
Merge branch 'BrunnerLivio-fix/process-memory-leak' into 6.0.0-next
2 parents 9f1a32c + c4b92e9 commit 3935279

8 files changed

Lines changed: 145 additions & 24 deletions

File tree

‎integration/hooks/e2e/on-app-shutdown.spec.ts‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { Test } from '@nestjs/testing';
22
import { expect } from 'chai';
33
import * as Sinon from 'sinon';
4-
import { Injectable, OnApplicationShutdown } from '@nestjs/common';
5-
import { spawn } from 'child_process';
4+
import { Injectable, OnApplicationShutdown, ShutdownSignal } from '@nestjs/common';
5+
import { spawn, spawnSync } from 'child_process';
6+
import { join } from 'path';
67

78
@Injectable()
89
class TestInjectable implements OnApplicationShutdown {
@@ -20,4 +21,28 @@ describe('OnApplicationShutdown', () => {
2021
const instance = module.get(TestInjectable);
2122
expect(instance.onApplicationShutdown.called).to.be.true;
2223
});
24+
25+
it('should call onApplicationShutdown if any shutdown signal gets invoked', done => {
26+
const result = spawnSync('ts-node', [join(__dirname, '../src/main.ts'), 'SIGHUP']);
27+
expect(result.stdout.toString().trim()).to.be.eq('Signal SIGHUP');
28+
done();
29+
});
30+
31+
it('should call onApplicationShutdown if a specific shutdown signal gets invoked', done => {
32+
const result = spawnSync('ts-node', [join(__dirname, '../src/main.ts'), 'SIGINT', 'SIGINT']);
33+
expect(result.stdout.toString().trim()).to.be.eq('Signal SIGINT');
34+
done();
35+
});
36+
37+
it('should ignore system signals which are not specified', done => {
38+
const result = spawnSync('ts-node', [join(__dirname, '../src/main.ts'), 'SIGINT', 'SIGHUP']);
39+
expect(result.stdout.toString().trim()).to.be.eq('');
40+
done();
41+
});
42+
43+
it('should ignore system signals if "enableShutdownHooks" was not called', done => {
44+
const result = spawnSync('ts-node', [join(__dirname, '../src/main.ts'), 'SIGINT', 'NONE']);
45+
expect(result.stdout.toString().trim()).to.be.eq('');
46+
done();
47+
});
2348
});

‎integration/hooks/src/main.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { Injectable, OnApplicationShutdown, Module } from '@nestjs/common';
2+
import { NestFactory } from '@nestjs/core';
3+
const SIGNAL = process.argv[2];
4+
const SIGNAL_TO_LISTEN = process.argv[3];
5+
6+
@Injectable()
7+
class TestInjectable implements OnApplicationShutdown {
8+
onApplicationShutdown(signal: string) {
9+
console.log('Signal ' + signal);
10+
}
11+
}
12+
13+
@Module({
14+
providers: [TestInjectable],
15+
})
16+
class AppModule { }
17+
18+
async function bootstrap() {
19+
const app = await NestFactory.create(AppModule, { logger: true });
20+
21+
if (SIGNAL_TO_LISTEN && SIGNAL_TO_LISTEN !== 'NONE') {
22+
app.enableShutdownHooks([SIGNAL_TO_LISTEN]);
23+
} else if (SIGNAL_TO_LISTEN !== 'NONE') {
24+
app.enableShutdownHooks();
25+
}
26+
27+
await app.listen(1800);
28+
process.kill(process.pid, SIGNAL);
29+
}
30+
31+
bootstrap();

‎packages/common/enums/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
export * from './request-method.enum';
22
export * from './http-status.enum';
3+
export * from './shutdown-signal.enum';

‎packages/common/enums/shutdown-signal.enum.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/**
2+
* System signals which shut down a process
3+
*/
4+
export enum ShutdownSignal {
5+
SIGHUP = 'SIGHUP',
6+
SIGINT = 'SIGINT',
7+
SIGQUIT = 'SIGQUIT',
8+
SIGILL = 'SIGILL',
9+
SIGTRAP = 'SIGTRAP',
10+
SIGABRT = 'SIGABRT',
11+
SIGBUS = 'SIGBUS',
12+
SIGFPE = 'SIGFPE',
13+
SIGSEGV = 'SIGSEGV',
14+
SIGUSR2 = 'SIGUSR2',
15+
SIGTERM = 'SIGTERM',
16+
}

‎packages/common/interfaces/nest-application-context.interface.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { LoggerService } from '../services/logger.service';
22
import { Abstract } from './abstract.interface';
33
import { Type } from './type.interface';
4+
import { ShutdownSignal } from '../enums/shutdown-signal.enum';
45

56
export interface INestApplicationContext {
67
/**
@@ -29,4 +30,13 @@ export interface INestApplicationContext {
2930
* @returns {void}
3031
*/
3132
useLogger(logger: LoggerService): void;
33+
34+
/**
35+
* Enables the usage of shutdown hooks. Will call the
36+
* `onApplicationShutdown` function of a provider if the
37+
* process receives a shutdown signal.
38+
*
39+
* @returns {this} The Nest application context instance
40+
*/
41+
enableShutdownHooks(signals?: ShutdownSignal[] | string[]): this;
3242
}

‎packages/core/constants.ts‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,3 @@ export const APP_INTERCEPTOR = 'APP_INTERCEPTOR';
99
export const APP_PIPE = 'APP_PIPE';
1010
export const APP_GUARD = 'APP_GUARD';
1111
export const APP_FILTER = 'APP_FILTER';
12-
export const SHUTDOWN_SIGNALS = [
13-
'SIGHUP',
14-
'SIGINT',
15-
'SIGQUIT',
16-
'SIGILL',
17-
'SIGTRAP',
18-
'SIGABRT',
19-
'SIGBUS',
20-
'SIGFPE',
21-
'SIGSEGV',
22-
'SIGUSR2',
23-
'SIGTERM',
24-
];

‎packages/core/nest-application-context.ts‎

Lines changed: 60 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
import { INestApplicationContext, Logger, LoggerService } from '@nestjs/common';
1+
import {
2+
INestApplicationContext,
3+
Logger,
4+
LoggerService,
5+
ShutdownSignal,
6+
} from '@nestjs/common';
27
import { Abstract } from '@nestjs/common/interfaces';
38
import { Type } from '@nestjs/common/interfaces/type.interface';
4-
import { SHUTDOWN_SIGNALS } from './constants';
9+
import { isEmpty } from '@nestjs/common/utils/shared.utils';
510
import { UnknownModuleException } from './errors/exceptions/unknown-module.exception';
611
import {
712
callAppShutdownHook,
@@ -17,6 +22,7 @@ import { ModuleTokenFactory } from './injector/module-token-factory';
1722
export class NestApplicationContext implements INestApplicationContext {
1823
private readonly moduleTokenFactory = new ModuleTokenFactory();
1924
private readonly containerScanner: ContainerScanner;
25+
private readonly activeShutdownSignals: string[] = new Array<string>();
2026

2127
constructor(
2228
protected readonly container: NestContainer,
@@ -60,7 +66,6 @@ export class NestApplicationContext implements INestApplicationContext {
6066
public async init(): Promise<this> {
6167
await this.callInitHook();
6268
await this.callBootstrapHook();
63-
await this.listenToShutdownSignals();
6469
return this;
6570
}
6671

@@ -73,14 +78,61 @@ export class NestApplicationContext implements INestApplicationContext {
7378
Logger.overrideLogger(logger);
7479
}
7580

76-
protected listenToShutdownSignals() {
77-
SHUTDOWN_SIGNALS.forEach((signal: any) =>
78-
process.on(signal, async code => {
81+
/**
82+
* Enables the usage of shutdown hooks. Will call the
83+
* `onApplicationShutdown` function of a provider if the
84+
* process receives a shutdown signal.
85+
*
86+
* @param {ShutdownSignal[]} [signals=[]] The system signals it should listen to
87+
*
88+
* @returns {this} The Nest application context instance
89+
*/
90+
public enableShutdownHooks(signals: (ShutdownSignal | string)[] = []): this {
91+
if (isEmpty(signals)) {
92+
signals = Object.keys(ShutdownSignal).map(
93+
(key: string) => ShutdownSignal[key],
94+
);
95+
} else {
96+
// Given signals array should be unique because
97+
// process shouldn't listen to the same signal more than once.
98+
signals = Array.from(new Set(signals));
99+
}
100+
101+
signals = signals
102+
.map((signal: ShutdownSignal | string): string =>
103+
signal
104+
.toString()
105+
.toUpperCase()
106+
.trim(),
107+
)
108+
// Filter out the signals which is already listening to
109+
.filter(
110+
(signal: string) => !this.activeShutdownSignals.includes(signal),
111+
) as string[];
112+
113+
this.listenToShutdownSignals(signals);
114+
return this;
115+
}
116+
117+
/**
118+
* Listens to shutdown signals by listening to
119+
* process events
120+
*
121+
* @param {string[]} signals The system signals it should listen to
122+
*/
123+
protected listenToShutdownSignals(signals: string[]) {
124+
signals.forEach((signal: string) => {
125+
this.activeShutdownSignals.push(signal);
126+
127+
process.on(signal as any, async code => {
128+
// Call the destroy and shutdown hook
129+
// in case the process receives a shutdown signal
79130
await this.callDestroyHook();
80131
await this.callShutdownHook(signal);
132+
81133
process.exit(code || 1);
82-
}),
83-
);
134+
});
135+
});
84136
}
85137

86138
/**

‎packages/core/nest-application.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ export class NestApplication extends NestApplicationContext
126126
await this.callInitHook();
127127
await this.registerRouterHooks();
128128
await this.callBootstrapHook();
129-
await this.listenToShutdownSignals();
130129

131130
this.isInitialized = true;
132131
this.logger.log(MESSAGES.APPLICATION_READY);

0 commit comments

Comments
 (0)