#176 Small refactoring

This commit is contained in:
Jakub Al-Khalili 2019-11-06 16:20:32 +01:00
parent dbf6184898
commit d68430cdf1
1 changed files with 4 additions and 4 deletions

View File

@ -219,19 +219,19 @@ func triggerBackup(ticker *time.Ticker, k8sClient k8s.Client, logger logr.Logger
func (bar *BackupAndRestore) EnsureBackupTrigger() error { func (bar *BackupAndRestore) EnsureBackupTrigger() error {
trigger, found := triggers.get(bar.jenkins.Namespace, bar.jenkins.Name) trigger, found := triggers.get(bar.jenkins.Namespace, bar.jenkins.Name)
isBackupConfigured := len(bar.jenkins.Spec.Backup.ContainerName) == 0 || bar.jenkins.Spec.Backup.Interval == 0 isBackupConfigured := len(bar.jenkins.Spec.Backup.ContainerName) > 0 && bar.jenkins.Spec.Backup.Interval > 0
if found && !isBackupConfigured { if found && !isBackupConfigured {
bar.StopBackupTrigger() bar.StopBackupTrigger()
return nil return nil
} }
// configured backup has no trigger // configured backup has no trigger
if !found { if !found && isBackupConfigured {
bar.startBackupTrigger() bar.startBackupTrigger()
return nil
} }
// configured interval has changes if found && isBackupConfigured && bar.jenkins.Spec.Backup.Interval != trigger.interval {
if found && bar.jenkins.Spec.Backup.Interval != trigger.interval {
bar.StopBackupTrigger() bar.StopBackupTrigger()
bar.startBackupTrigger() bar.startBackupTrigger()
} }