From 08489c82373f3cd12761798eddd3d5c9985a7fe2 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Wed, 27 Mar 2024 16:47:23 +0530 Subject: [PATCH] Tweak "render-process-gone" handler --- desktop/src/main/init.ts | 13 ++++--------- desktop/src/main/log.ts | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/desktop/src/main/init.ts b/desktop/src/main/init.ts index af79f39ad3..da2ffddc18 100644 --- a/desktop/src/main/init.ts +++ b/desktop/src/main/init.ts @@ -9,7 +9,7 @@ import { getHideDockIconPreference } from "../services/userPreference"; import { isPlatform } from "../utils/common/platform"; import { buildContextMenu, buildMenuBar } from "../utils/menu"; import log from "./log"; -import { isDev } from "./util"; +import { execAsync, isDev } from "./util"; /** * Create an return the {@link BrowserWindow} that will form our app's UI. @@ -44,19 +44,14 @@ export const createWindow = async () => { // Open the DevTools automatically when running in dev mode if (isDev) mainWindow.webContents.openDevTools(); - mainWindow.webContents.on("render-process-gone", (event, details) => { + mainWindow.webContents.on("render-process-gone", (_, details) => { + log.error(`render-process-gone: ${details}`); mainWindow.webContents.reload(); - logErrorSentry( - Error("render-process-gone"), - "webContents event render-process-gone", - { details }, - ); - ElectronLog.log("webContents event render-process-gone", details); }); mainWindow.webContents.on("unresponsive", () => { + log.error("webContents unresponsive"); mainWindow.webContents.forcefullyCrashRenderer(); - ElectronLog.log("webContents event unresponsive"); }); mainWindow.on("close", function (event) { diff --git a/desktop/src/main/log.ts b/desktop/src/main/log.ts index 25e025d823..e0b496eba6 100644 --- a/desktop/src/main/log.ts +++ b/desktop/src/main/log.ts @@ -50,7 +50,7 @@ export function logErrorSentry( const logError1 = (message: string, e?: unknown) => { if (!e) { - logError_(message); + logError_(`Error: ${message}`); return; } @@ -64,7 +64,7 @@ const logError1 = (message: string, e?: unknown) => { es = String(e); } - logError_(`${message}: ${es}`); + logError_(`Error: ${message}: ${es}`); }; const logError_ = (message: string) => {