github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't double-log unhandled rejections (#37501)

Browse Source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot]
2023-03-14 11:50:46 +01:00
committed by GitHub
parent c1b8848fd7
commit 4382f2adc0
5 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shell/browser/electron_browser_main_parts.cc
View File

@@ -279,7 +279,7 @@ void ElectronBrowserMainParts::PostEarlyInitialization() {
env->set_trace_sync_io(env->options()->trace_sync_io);
// We do not want to crash the main process on unhandled rejections.
env->options()->unhandled_rejections = "warn";
env->options()->unhandled_rejections = "warn-with-error-code";
// Add Electron extended APIs.
electron_bindings_->BindTo(js_env_->isolate(), env->process_object());

2
shell/renderer/electron_renderer_client.cc
View File

@@ -96,7 +96,7 @@ void ElectronRendererClient::DidCreateScriptContext(
env->options()->force_context_aware = true;
// We do not want to crash the renderer process on unhandled rejections.
env->options()->unhandled_rejections = "warn";
env->options()->unhandled_rejections = "warn-with-error-code";
environments_.insert(env);

13
spec/fixtures/api/unhandled-rejection-handled.js vendored Normal file
View File

@@ -0,0 +1,13 @@
const { app } = require('electron');
const handleUnhandledRejection = (reason) => {
console.error(`Unhandled Rejection: ${reason.stack}`);
app.quit();
};
const main = async () => {
process.on('unhandledRejection', handleUnhandledRejection);
throw new Error('oops');
};
main();

5
spec/fixtures/api/unhandled-rejection.js vendored Normal file
View File

@@ -0,0 +1,5 @@
const main = async () => {
throw new Error('oops');
};
main();

36
spec/node-spec.ts
View File

@@ -226,6 +226,42 @@ describe('node feature', () => {
}));
expect(result).to.equal('hello');
});
it('does not log the warning more than once when the rejection is unhandled', async () => {
const appPath = path.join(mainFixturesPath, 'api', 'unhandled-rejection.js');
const appProcess = childProcess.spawn(process.execPath, [appPath]);
let output = '';
const out = (data: string) => {
output += data;
if (/UnhandledPromiseRejectionWarning/.test(data)) {
appProcess.kill();
}
};
appProcess.stdout!.on('data', out);
appProcess.stderr!.on('data', out);
await emittedOnce(appProcess, 'exit');
expect(/UnhandledPromiseRejectionWarning/.test(output)).to.equal(true);
const matches = output.match(/Error: oops/gm);
expect(matches).to.have.lengthOf(1);
});
it('does not log the warning more than once when the rejection is handled', async () => {
const appPath = path.join(mainFixturesPath, 'api', 'unhandled-rejection-handled.js');
const appProcess = childProcess.spawn(process.execPath, [appPath]);
let output = '';
const out = (data: string) => { output += data; };
appProcess.stdout!.on('data', out);
appProcess.stderr!.on('data', out);
const [code] = await emittedOnce(appProcess, 'exit');
expect(code).to.equal(0);
expect(/UnhandledPromiseRejectionWarning/.test(output)).to.equal(false);
const matches = output.match(/Error: oops/gm);
expect(matches).to.have.lengthOf(1);
});
});
});