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

15
ts/util/incrementMessageCounter.ts
View file

@ -5,6 +5,7 @@ import { debounce, isNumber } from 'lodash';
import { strictAssert } from './assert';
import Data from '../sql/Client';
import * as log from '../logging/log';
let receivedAtCounter: number | undefined;
@ -18,26 +19,22 @@ export async function initializeMessageCounter(): Promise<void> {
const dbCounter = await Data.getMaxMessageCounter();
if (isNumber(dbCounter) && isNumber(storedCounter)) {
window.log.info(
'initializeMessageCounter: picking max of db/stored counters'
);
log.info('initializeMessageCounter: picking max of db/stored counters');
receivedAtCounter = Math.max(dbCounter, storedCounter);
if (receivedAtCounter !== storedCounter) {
window.log.warn(
'initializeMessageCounter: mismatch between db/stored counters'
);
log.warn('initializeMessageCounter: mismatch between db/stored counters');
}
} else if (isNumber(storedCounter)) {
window.log.info('initializeMessageCounter: picking stored counter');
log.info('initializeMessageCounter: picking stored counter');
receivedAtCounter = storedCounter;
} else if (isNumber(dbCounter)) {
window.log.info(
log.info(
'initializeMessageCounter: picking fallback counter from the database'
);
receivedAtCounter = dbCounter;
} else {
window.log.info('initializeMessageCounter: defaulting to Date.now()');
log.info('initializeMessageCounter: defaulting to Date.now()');
receivedAtCounter = Date.now();
}