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

AttachmentDownloads: Log second error, finish job even on failures

Browse source
This commit is contained in:
Scott Nonnenberg 2023-01-13 11:18:59 -08:00 • committed by GitHub
parent 662223df32
commit ef20c31c64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ts/messageModifiers/AttachmentDownloads.ts
View file

@ -226,7 +226,7 @@ async function _maybeStartJob(): Promise<void> {
} catch (deleteError) { } catch (deleteError) {
log.error( log.error(
`${logId}: Failed to delete attachment job`, `${logId}: Failed to delete attachment job`,
Errors.toLogFormat(error) Errors.toLogFormat(deleteError)
); );
} finally { } finally {
void _maybeStartJob(); void _maybeStartJob();
@ -371,16 +371,18 @@ async function _markAttachmentAsFailed(
const { id, messageId, attachment, type, index } = job; const { id, messageId, attachment, type, index } = job;
const message = await _getMessageById(id, messageId); const message = await _getMessageById(id, messageId);
if (!message) { try {
return; if (!message) {
return;
}
await _addAttachmentToMessage(
message,
_markAttachmentAsPermanentError(attachment),
{ type, index }
);
} finally {
await _finishJob(message, id);
} }
await _addAttachmentToMessage(
message,
_markAttachmentAsPermanentError(attachment),
{ type, index }
);
await _finishJob(message, id);
} }
async function _getMessageById( async function _getMessageById(