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

Use console logger when regular is not available

Browse source
This commit is contained in:
Fedor Indutny 2021-10-21 12:49:53 -07:00 • committed by GitHub
parent b2407f8310
commit 2c51c3fe84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/main.ts
View file

@ -30,6 +30,7 @@ import packageJson from '../package.json';
import * as GlobalErrors from './global_errors'; import * as GlobalErrors from './global_errors';
import { setup as setupSpellChecker } from './spell_check'; import { setup as setupSpellChecker } from './spell_check';
import { redactAll, addSensitivePath } from '../ts/util/privacy'; import { redactAll, addSensitivePath } from '../ts/util/privacy';
import { consoleLogger } from '../ts/util/consoleLogger';
import { remove as removeUserConfig } from './user_config'; import { remove as removeUserConfig } from './user_config';
import './startup_config'; import './startup_config';
@ -253,7 +254,8 @@ let settingsChannel: SettingsChannel | undefined;
function getLogger(): LoggerType { function getLogger(): LoggerType {
if (!logger) { if (!logger) {
throw new Error('getLogger: Logger not yet initialized!'); console.warn('getLogger: Logger not yet initialized!');
return consoleLogger;
} }
return logger; return logger;

24
ts/sql/Server.ts
View file

@ -36,6 +36,7 @@ import { STORAGE_UI_KEYS } from '../types/StorageUIKeys';
import { StoredJob } from '../jobs/types'; import { StoredJob } from '../jobs/types';
import { assert } from '../util/assert'; import { assert } from '../util/assert';
import { combineNames } from '../util/combineNames'; import { combineNames } from '../util/combineNames';
import { consoleLogger } from '../util/consoleLogger';
import { dropNull } from '../util/dropNull'; import { dropNull } from '../util/dropNull';
import { isNormalNumber } from '../util/isNormalNumber'; import { isNormalNumber } from '../util/isNormalNumber';
import { isNotNil } from '../util/isNotNil'; import { isNotNil } from '../util/isNotNil';
@ -2689,28 +2690,7 @@ function getOurUuid(db: Database): string | undefined {
} }
let globalInstance: Database | undefined; let globalInstance: Database | undefined;
/* eslint-disable no-console */ let logger = consoleLogger;
let logger: LoggerType = {
fatal(...args: Array<unknown>) {
console.error(...args);
},
error(...args: Array<unknown>) {
console.error(...args);
},
warn(...args: Array<unknown>) {
console.warn(...args);
},
info(...args: Array<unknown>) {
console.info(...args);
},
debug(...args: Array<unknown>) {
console.debug(...args);
},
trace(...args: Array<unknown>) {
console.log(...args);
},
};
/* eslint-enable no-console */
let globalInstanceRenderer: Database | undefined; let globalInstanceRenderer: Database | undefined;
let databaseFilePath: string | undefined; let databaseFilePath: string | undefined;
let indexedDBPath: string | undefined; let indexedDBPath: string | undefined;

27
ts/util/consoleLogger.ts Normal file
View file

@ -0,0 +1,27 @@
// Copyright 2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import type { LoggerType } from '../types/Logging';
/* eslint-disable no-console */
export const consoleLogger: LoggerType = {
fatal(...args: Array<unknown>) {
console.error(...args);
},
error(...args: Array<unknown>) {
console.error(...args);
},
warn(...args: Array<unknown>) {
console.warn(...args);
},
info(...args: Array<unknown>) {
console.info(...args);
},
debug(...args: Array<unknown>) {
console.debug(...args);
},
trace(...args: Array<unknown>) {
console.log(...args);
},
};
/* eslint-enable no-console */