Merge pull request #411 from mitchhentges/fix-sentry-exit-uncaught-exception

Updates sentry, removes UncaughtException integration

Author: mitchhentges

package-lock.json

@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@james-proxy/james-browser-launcher": "^1.3.2",
-    "@sentry/browser": "^4.0.2",
-    "@sentry/node": "^4.0.1",
+    "@sentry/browser": "^4.5.3",
+    "@sentry/node": "^4.5.3",
     "electron-updater": "3.1.2",
     "font-awesome": "^4.5.0",
     "history": "^4.7.2",

package.json

@@ -9,6 +9,7 @@ export default function init(app, Sentry) {
   const { dsn, host } = config.sentry;
   Sentry.init({
     dsn: `https://${dsn}@${host}`,
-    release: config.version(app)
+    release: config.version(app),
+    defaultIntegrations
   });
 }

src/common/service/sentry.js

@@ -13,7 +13,21 @@ import createUrlMapper from './url-mapper.js';
 import createProxy from './proxy.js';
 import autoUpdater from './auto-update.js';
 
-sentryInit(app, Sentry);
+import * as sentryNode from '@sentry/node';
+
+// TODO remove this global handler and Sentry integration override!
+// See bug: https://github.com/james-proxy/james/issues/405
+process.on('uncaughtException', (error) => {
+  console.warn('Ignored fatal error!', error); // eslint-disable-line no-console
+  Sentry.captureException(error);
+});
+
+// Replace default onFatalError implementation (that kills the process) with a noop
+// Uncaught exceptions will be reported to exceptions manually in our override handler above
+const defaultIntegrations = sentryNode.defaultIntegrations
+  .filter(integration => !(integration instanceof sentryNode.Integrations.OnUncaughtException));
+
+sentryInit(app, Sentry, defaultIntegrations);
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the javascript object is GCed.
 let mainWindow = null;
@@ -24,11 +38,6 @@ const urlMapper = createUrlMapper({
   autoload: true
 });
 
-process.on('uncaughtException', (error) => {
-  // TODO remove this global handler!
-  console.warn('Ignored fatal error!', error); // eslint-disable-line no-console
-});
-
 console.log('Starting proxy...'); // eslint-disable-line no-console
 const proxy = createProxy(config, urlMapper.urlMapper);