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

Auto-retry transient update errors once

Browse source 
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2024-12-20 12:00:24 -06:00 committed by GitHub
parent b020589be1
commit e050e0a6ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ts/updater/common.ts
View file

@ -111,6 +111,10 @@ enum CheckType {
ForceDownload = 'ForceDownload',
}
const MAX_AUTO_RETRY_ATTEMPTS = 1;
const AUTO_RETRY_DELAY = durations.DAY;
export abstract class Updater {
protected fileName: string | undefined;
@ -139,6 +143,10 @@ export abstract class Updater {
private readonly canRunSilently: () => boolean;
private autoRetryAttempts = 0;
private autoRetryAfter: number | undefined;
constructor({
settingsChannel,
logger,
@ -268,7 +276,7 @@ export abstract class Updater {
);
const timeoutMs = selectedPollTime - now;
this.logger.info(`updater/start: polling in ${timeoutMs}ms`);
this.logger.info(`updater/schedulePoll: polling in ${timeoutMs}ms`);
setTimeout(() => {
drop(this.safePoll());
@ -277,10 +285,17 @@ export abstract class Updater {
private async safePoll(): Promise<void> {
try {
this.logger.info('updater/start: polling now');
if (this.autoRetryAfter != null && Date.now() < this.autoRetryAfter) {
this.logger.info(
`updater/safePoll: not polling until ${this.autoRetryAfter}`
);
return;
}
this.logger.info('updater/safePoll: polling now');
await this.checkForUpdatesMaybeInstall(CheckType.Normal);
} catch (error) {
this.logger.error(`updater/start: ${Errors.toLogFormat(error)}`);
this.logger.error(`updater/safePoll: ${Errors.toLogFormat(error)}`);
} finally {
this.schedulePoll();
}
@ -323,9 +338,27 @@ export abstract class Updater {
// Restore state in case of download error
this.version = oldVersion;
if (
mode === DownloadMode.Automatic &&
this.autoRetryAttempts < MAX_AUTO_RETRY_ATTEMPTS
) {
this.autoRetryAttempts += 1;
this.autoRetryAfter = Date.now() + AUTO_RETRY_DELAY;
logger.warn(
'downloadAndInstall: transient error ' +
`${Errors.toLogFormat(error)}, ` +
`attempts=${this.autoRetryAttempts}, ` +
`retryAfter=${this.autoRetryAfter}`
);
return false;
}
throw error;
}
this.autoRetryAttempts = 0;
this.autoRetryAfter = undefined;
if (!downloadResult) {
logger.warn('downloadAndInstall: no update was downloaded');
strictAssert(
@ -389,7 +422,9 @@ export abstract class Updater {
return true;
} catch (error) {
logger.error(`downloadAndInstall: ${Errors.toLogFormat(error)}`);
logger.error(
`downloadAndInstall: fatal error ${Errors.toLogFormat(error)}`
);
this.markCannotUpdate(error);
throw error;
}