Merge pull request #1158 from elliott-logrocket/error-on-watch-when-keep-local-is-negative

Slach · web-flow · commit 6445f3eaa1a1 · 2025-06-04T13:24:08.000+04:00
Fixes erroneous error when backup_to_keep_local=-1
diff --git a/pkg/backup/watch.go b/pkg/backup/watch.go
@@ -179,7 +179,7 @@ func (b *Backuper) Watch(watchInterval, fullInterval, watchBackupNameTemplate, t
 
 			}
 
-			if createRemoteErrCount > b.cfg.General.BackupsToKeepRemote || deleteLocalErrCount > b.cfg.General.BackupsToKeepLocal {
+			if createRemoteErrCount > b.cfg.General.BackupsToKeepRemote || deleteLocalErrCount > b.cfg.General.BackupsToKeepLocal && b.cfg.General.BackupsToKeepLocal >= 0 {
 				return fmt.Errorf("too many errors create_remote: %d, delete local: %d, during watch full_interval: %s, abort watching", createRemoteErrCount, deleteLocalErrCount, b.cfg.General.FullInterval)
 			}
 			if (createRemoteErr != nil || deleteLocalErr != nil) && time.Now().Sub(lastFullBackup) > b.cfg.General.FullDuration {

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func (b *Backuper) Watch(watchInterval, fullInterval, watchBackupNameTemplate, t`
`179`	`179`
`180`	`180`	`}`
`181`	`181`
`182`		`- if createRemoteErrCount > b.cfg.General.BackupsToKeepRemote \|\| deleteLocalErrCount > b.cfg.General.BackupsToKeepLocal {`
	`182`	`+ if createRemoteErrCount > b.cfg.General.BackupsToKeepRemote \|\| deleteLocalErrCount > b.cfg.General.BackupsToKeepLocal && b.cfg.General.BackupsToKeepLocal >= 0 {`
`183`	`183`	`return fmt.Errorf("too many errors create_remote: %d, delete local: %d, during watch full_interval: %s, abort watching", createRemoteErrCount, deleteLocalErrCount, b.cfg.General.FullInterval)`
`184`	`184`	`}`
`185`	`185`	`if (createRemoteErr != nil \|\| deleteLocalErr != nil) && time.Now().Sub(lastFullBackup) > b.cfg.General.FullDuration {`