Skip to content

Commit 3e84d2d

Browse files
authored
ignore normal exit when reporting API process close (#431)
1 parent 5c9fe2f commit 3e84d2d

File tree

7 files changed

+115
-249
lines changed

7 files changed

+115
-249
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ node_modules
3434
release
3535
src/main.prod.js
3636
src/main.prod.js.map
37+
src/main.prod.js.LICENSE.txt
3738
src/renderer.prod.js
3839
src/renderer.prod.js.map
3940
src/style.css

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@
253253
"webpack": "^5.94.0",
254254
"webpack-bundle-analyzer": "^4.10.2",
255255
"webpack-cli": "^4.7.2",
256-
"webpack-dev-server": "^5.1.0",
256+
"webpack-dev-server": "^4.15.2",
257257
"webpack-merge": "^5.10.0",
258258
"yarn-deduplicate": "^6.0.2"
259259
},

src/cli.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ChildProcessWithoutNullStreams, spawn } from 'child_process';
2-
import * as Sentry from '@sentry/electron';
2+
import * as Sentry from '@sentry/electron/main';
33
import { ChannelCredentials } from '@grpc/grpc-js';
44
import { createServer } from 'net';
55

@@ -39,10 +39,14 @@ export async function start(sentryDSN: string): Promise<CLI> {
3939
});
4040
process.on('close', (code, signal) => {
4141
if (signal != null) return;
42-
Sentry.captureEvent({
43-
message: 'API process unexpectedly quit',
44-
extra: { code },
45-
});
42+
if ((code || 0) > 0) {
43+
// code == -2 when the child process didn't start at all,
44+
// code == 0 when we close the child process
45+
Sentry.captureEvent({
46+
message: 'API process unexpectedly quit',
47+
extra: { code },
48+
});
49+
}
4650
});
4751

4852
const configClient = new ConfigClient(

src/main.dev.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
MessageBoxOptions,
1717
} from 'electron';
1818
import * as grpc from '@grpc/grpc-js';
19-
import * as Sentry from '@sentry/electron';
19+
import * as Sentry from '@sentry/electron/main';
2020
import log from 'electron-log';
2121
import { autoUpdater } from 'electron-updater';
2222
import { menubar } from 'menubar';

src/main.prod.js.LICENSE.txt

-50
This file was deleted.

src/renderer/window.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as Sentry from '@sentry/electron';
1+
import * as Sentry from '@sentry/electron/main';
22
import { BrowserWindow } from 'electron';
33
import { getAssetPath } from '../main/binaries';
44
import MenuBuilder from './menu';

0 commit comments

Comments
 (0)