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

Increase max attempt count for unprocessed items

Browse source
This commit is contained in:
Fedor Indutny 2022-12-21 16:06:50 -08:00 • committed by GitHub
parent a80c6d89a8
commit ecbf84638d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ts/sql/Server.ts
View file

@ -3209,7 +3209,10 @@ function saveUnprocessedSync(data: UnprocessedType): string {
throw new Error('saveUnprocessedSync: id was falsey'); throw new Error('saveUnprocessedSync: id was falsey');
} }
if (attempts >= MAX_UNPROCESSED_ATTEMPTS) { if (attempts > MAX_UNPROCESSED_ATTEMPTS) {
logger.warn(
`saveUnprocessedSync: not saving ${id} due to exhausted attempts`
);
removeUnprocessedSync(id); removeUnprocessedSync(id);
return id; return id;
} }
@ -3376,7 +3379,7 @@ async function getAllUnprocessedAndIncrementAttempts(): Promise<
.prepare<Query>( .prepare<Query>(
` `
DELETE FROM unprocessed DELETE FROM unprocessed
WHERE attempts >= $MAX_UNPROCESSED_ATTEMPTS WHERE attempts > $MAX_UNPROCESSED_ATTEMPTS
` `
) )
.run({ MAX_UNPROCESSED_ATTEMPTS }); .run({ MAX_UNPROCESSED_ATTEMPTS });

9
ts/textsecure/MessageReceiver.ts
View file

@ -776,6 +776,13 @@ export default class MessageReceiver
} }
private async queueAllCached(): Promise<void> { private async queueAllCached(): Promise<void> {
if (this.stoppingProcessing) {
log.info(
'MessageReceiver.queueAllCached: not running due to stopped processing'
);
return;
}
const items = await this.getAllFromCache(); const items = await this.getAllFromCache();
const max = items.length; const max = items.length;
for (let i = 0; i < max; i += 1) { for (let i = 0; i < max; i += 1) {
@ -1098,7 +1105,7 @@ export default class MessageReceiver
id, id,
version: 2, version: 2,
attempts: 1, attempts: 0,
envelope: Bytes.toBase64(plaintext), envelope: Bytes.toBase64(plaintext),
messageAgeSec: envelope.messageAgeSec, messageAgeSec: envelope.messageAgeSec,
receivedAtCounter: envelope.receivedAtCounter, receivedAtCounter: envelope.receivedAtCounter,