Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Revert "fix(listeners): avoid "too many listeners" problem (#3931)" (#4222)

Browse source 
This holds on to process / handlers forever.
This commit is contained in:
Pavel Feldman 2020-10-23 10:04:55 -07:00 committed by GitHub
parent 8f3c0d5420
commit c4fbc6436a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/server/processLauncher.ts
View file

@ -23,7 +23,6 @@ import { helper } from './helper';
import { Progress } from './progress'; import { Progress } from './progress';
import * as types from './types'; import * as types from './types';
import { isUnderTest } from '../utils/utils'; import { isUnderTest } from '../utils/utils';
import { EventEmitter } from 'events';
export type Env = {[key: string]: string | number | boolean | undefined}; export type Env = {[key: string]: string | number | boolean | undefined};
@ -59,26 +58,6 @@ export async function gracefullyCloseAll() {
await Promise.all(Array.from(gracefullyCloseSet).map(gracefullyClose => gracefullyClose().catch(e => {}))); await Promise.all(Array.from(gracefullyCloseSet).map(gracefullyClose => gracefullyClose().catch(e => {})));
} }
class EventEmitterWrapper extends EventEmitter {
private _wrappedEvents: Set<string | symbol>;
constructor(emitter: EventEmitter) {
super();
this.setMaxListeners(0);
this._wrappedEvents = new Set();
for (const method of ['addListener', 'on', 'once', 'prependListener', 'prependOnceListener'] as const) {
this[method] = (event: string | symbol, listener: (...args: any[]) => void) => {
if (!this._wrappedEvents.has(event)) {
this._wrappedEvents.add(event);
emitter.addListener(event, (...eventArgs) => this.emit(event, ...eventArgs));
}
return super[method](event, listener);
};
}
}
}
const processWrapper = new EventEmitterWrapper(process);
export async function launchProcess(options: LaunchProcessOptions): Promise<LaunchResult> { export async function launchProcess(options: LaunchProcessOptions): Promise<LaunchResult> {
const cleanup = () => helper.removeFolders(options.tempDirectories); const cleanup = () => helper.removeFolders(options.tempDirectories);
@ -136,9 +115,9 @@ export async function launchProcess(options: LaunchProcessOptions): Promise<Laun
cleanup().then(fulfillCleanup); cleanup().then(fulfillCleanup);
}); });
const listeners = [ helper.addEventListener(processWrapper, 'exit', killProcess) ]; const listeners = [ helper.addEventListener(process, 'exit', killProcess) ];
if (options.handleSIGINT) { if (options.handleSIGINT) {
listeners.push(helper.addEventListener(processWrapper, 'SIGINT', () => { listeners.push(helper.addEventListener(process, 'SIGINT', () => {
gracefullyClose().then(() => { gracefullyClose().then(() => {
// Give tests a chance to dispatch any async calls. // Give tests a chance to dispatch any async calls.
if (isUnderTest()) if (isUnderTest())
@ -149,9 +128,9 @@ export async function launchProcess(options: LaunchProcessOptions): Promise<Laun
})); }));
} }
if (options.handleSIGTERM) if (options.handleSIGTERM)
listeners.push(helper.addEventListener(processWrapper, 'SIGTERM', gracefullyClose)); listeners.push(helper.addEventListener(process, 'SIGTERM', gracefullyClose));
if (options.handleSIGHUP) if (options.handleSIGHUP)
listeners.push(helper.addEventListener(processWrapper, 'SIGHUP', gracefullyClose)); listeners.push(helper.addEventListener(process, 'SIGHUP', gracefullyClose));
gracefullyCloseSet.add(gracefullyClose); gracefullyCloseSet.add(gracefullyClose);
let gracefullyClosing = false; let gracefullyClosing = false;