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

Import log instead of using it off of window

Browse source
This commit is contained in:
Josh Perez 2021-09-17 14:27:53 -04:00 • committed by GitHub
parent 8eb0dd3116
commit 65ddf0a9e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
155 changed files with 3654 additions and 3433 deletions
Download patch file Download diff file Expand all files Collapse all files

30
preload.js
View file

@ -35,6 +35,8 @@ try {
setEnvironment(parseEnvironment(config.environment));
const log = require('./ts/logging/log');
let title = config.name;
if (getEnvironment() !== Environment.Production) {
title += ` - ${getEnvironment()}`;
@ -89,7 +91,7 @@ try {
try {
return semver.lt(toCheck, baseVersion);
} catch (error) {
window.log.error(
log.error(
`isBeforeVersion error: toCheck: ${toCheck}, baseVersion: ${baseVersion}`,
error && error.stack ? error.stack : error
);
@ -100,7 +102,7 @@ try {
try {
return semver.gt(toCheck, baseVersion);
} catch (error) {
window.log.error(
log.error(
`isBeforeVersion error: toCheck: ${toCheck}, baseVersion: ${baseVersion}`,
error && error.stack ? error.stack : error
);
@ -133,11 +135,11 @@ try {
window.eval = global.eval = () => null;
window.drawAttention = () => {
window.log.info('draw attention');
log.info('draw attention');
ipc.send('draw-attention');
};
window.showWindow = () => {
window.log.info('show window');
log.info('show window');
ipc.send('show-window');
};
@ -158,15 +160,15 @@ try {
};
window.restart = () => {
window.log.info('restart');
log.info('restart');
ipc.send('restart');
};
window.shutdown = () => {
window.log.info('shutdown');
log.info('shutdown');
ipc.send('shutdown');
};
window.showDebugLog = () => {
window.log.info('showDebugLog');
log.info('showDebugLog');
ipc.send('show-debug-log');
};
@ -286,7 +288,7 @@ try {
try {
await deleteAllData();
} catch (error) {
window.log.error('delete-all-data: error', error && error.stack);
log.error('delete-all-data: error', error && error.stack);
}
});
@ -334,7 +336,7 @@ try {
ipc.on('get-ready-for-shutdown', async () => {
const { shutdown } = window.Events || {};
if (!shutdown) {
window.log.error('preload shutdown handler: shutdown method not found');
log.error('preload shutdown handler: shutdown method not found');
ipc.send('now-ready-for-shutdown');
return;
}
@ -358,7 +360,7 @@ try {
require('./ts/logging/set_up_renderer_logging').initialize();
if (config.proxyUrl) {
window.log.info('Using provided proxy url');
log.info('Using provided proxy url');
}
window.nodeSetImmediate = setImmediate;
@ -448,7 +450,7 @@ try {
Attachments,
userDataPath,
getRegionCode: () => window.storage.get('regionCode'),
logger: window.log,
logger: log,
});
if (config.enableCI) {
@ -464,6 +466,10 @@ try {
require('./ts/backbone/views/whisper_view');
require('./ts/backbone/views/toast_view');
require('./ts/views/conversation_view');
require('./ts/views/inbox_view');
require('./ts/views/install_view');
require('./ts/views/recorder_view');
require('./ts/views/standalone_registration_view');
require('./ts/SignalProtocolStore');
require('./ts/background');
@ -486,6 +492,7 @@ try {
if (config.environment === 'test') {
require('./preload_test');
}
log.info('preload complete');
} catch (error) {
/* eslint-disable no-console */
if (console._log) {
@ -499,4 +506,3 @@ try {
}
preloadEndTime = Date.now();
window.log.info('preload complete');