diff --git a/src/server/processLauncher.ts b/src/server/processLauncher.ts index b95845ef45..361cf15d96 100644 --- a/src/server/processLauncher.ts +++ b/src/server/processLauncher.ts @@ -95,12 +95,12 @@ export async function launchProcess(options: LaunchProcessOptions): Promise { - options.log('[out] ' + data); + options.log(`[pid=${spawnedProcess.pid}][out] ` + data); }); const stderr = readline.createInterface({ input: spawnedProcess.stderr }); stderr.on('line', (data: string) => { - options.log('[err] ' + data); + options.log(`[pid=${spawnedProcess.pid}][err] ` + data); }); let processClosed = false; @@ -109,7 +109,7 @@ export async function launchProcess(options: LaunchProcessOptions): Promise {}; const waitForCleanup = new Promise(f => fulfillCleanup = f); spawnedProcess.once('exit', (exitCode, signal) => { - options.log(``); + options.log(`[pid=${spawnedProcess.pid}] `); processClosed = true; helper.removeEventListeners(listeners); gracefullyCloseSet.delete(gracefullyClose); @@ -145,21 +145,21 @@ export async function launchProcess(options: LaunchProcessOptions): Promise`); + options.log(`[pid=${spawnedProcess.pid}] `); killProcess(); await waitForClose; // Ensure the process is dead and we called options.onkill. return; } gracefullyClosing = true; - options.log(``); + options.log(`[pid=${spawnedProcess.pid}] `); await options.attemptToGracefullyClose().catch(() => killProcess()); await waitForCleanup; // Ensure the process is dead and we have cleaned up. - options.log(``); + options.log(`[pid=${spawnedProcess.pid}] `); } // This method has to be sync to be used as 'exit' event handler. function killProcess() { - options.log(``); + options.log(`[pid=${spawnedProcess.pid}] `); helper.removeEventListeners(listeners); if (spawnedProcess.pid && !spawnedProcess.killed && !processClosed) { // Force kill the browser.