mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Introduce buffered console logger

Browse source
This commit is contained in:
Fedor Indutny 2023-03-28 15:22:06 -07:00 • committed by GitHub
parent 6dab8c70a1
commit d1791ff6be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 67 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/main.ts
View file

@ -44,7 +44,7 @@ import { createSupportUrl } from '../ts/util/createSupportUrl';
import { missingCaseError } from '../ts/util/missingCaseError';
import { strictAssert } from '../ts/util/assert';
import { drop } from '../ts/util/drop';
import { consoleLogger } from '../ts/util/consoleLogger';
import { createBufferedConsoleLogger } from '../ts/util/consoleLogger';
import type { ThemeSettingType } from '../ts/types/StorageUIKeys';
import { ThemeType } from '../ts/types/Util';
import * as Errors from '../ts/types/errors';
@ -135,6 +135,16 @@ let mainWindow: BrowserWindow | undefined;
let mainWindowCreated = false;
let loadingWindow: BrowserWindow | undefined;
// Create a buffered logger to hold our log lines until we fully initialize
// the logger in `app.on('ready')`
const consoleLogger = createBufferedConsoleLogger();
// These will be set after app fires the 'ready' event
let logger: LoggerType | undefined;
let preferredSystemLocales: Array<string> | undefined;
let resolvedTranslationsLocale: LocaleType | undefined;
let settingsChannel: SettingsChannel | undefined;
const activeWindows = new Set<BrowserWindow>();
function getMainWindow() {
@ -170,6 +180,12 @@ const defaultWebPrefs = {
const DISABLE_GPU =
OS.isLinux() && !process.argv.some(arg => arg === '--enable-gpu');
const FORCE_ENABLE_CRASH_REPORTS = process.argv.some(
arg => arg === '--enable-crash-reports'
);
setupCrashReports(getLogger, FORCE_ENABLE_CRASH_REPORTS);
function showWindow() {
if (!mainWindow) {
return;
@ -347,12 +363,6 @@ if (windowFromUserConfig) {
let menuOptions: CreateTemplateOptionsType | undefined;
// These will be set after app fires the 'ready' event
let logger: LoggerType | undefined;
let preferredSystemLocales: Array<string> | undefined;
let resolvedTranslationsLocale: LocaleType | undefined;
let settingsChannel: SettingsChannel | undefined;
function getLogger(): LoggerType {
if (!logger) {
console.warn('getLogger: Logger not yet initialized!');
@ -1673,7 +1683,8 @@ app.on('ready', async () => {
logger = await logging.initialize(getMainWindow);
await setupCrashReports(getLogger);
// Write buffered information into newly created logger.
consoleLogger.writeBufferInto(logger);
if (!resolvedTranslationsLocale) {
preferredSystemLocales = resolveCanonicalLocales(