Merge pull request #9546 from bc547-dev/master

Make autoSync more robust for network errors
Eugeny · Mar 27, 2024 · 8f68105 · 8f68105
2 parents 24c64a5 + 66b7632
commit 8f68105
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/tabby-settings/src/services/configSync.service.ts b/tabby-settings/src/services/configSync.service.ts
@@ -184,13 +184,17 @@ export class ConfigSyncService {
 
  private async autoSync () {
  while (true) {
- if (this.isEnabled() && this.config.store.configSync.auto) {
- const cfg = await this.getConfig(this.config.store.configSync.configID)
- if (new Date(cfg.modified_at) > this.lastRemoteChange) {
- this.logger.info('Remote config changed, downloading')
- this.download()
- this.lastRemoteChange = new Date(cfg.modified_at)
+ try {
+ if (this.isEnabled() && this.config.store.configSync.auto) {
+ const cfg = await this.getConfig(this.config.store.configSync.configID)
+ if (new Date(cfg.modified_at) > this.lastRemoteChange) {
+ this.logger.info('Remote config changed, downloading')
+ this.download()
+ this.lastRemoteChange = new Date(cfg.modified_at)
+ }
  }
+ } catch (error) {
+ this.logger.debug('Recovering from autoSync network error')
  }
  await new Promise(resolve => setTimeout(resolve, 60000))
  }