Skip to content
This repository was archived by the owner on Jan 16, 2023. It is now read-only.

fix(conflicts): fix conflicts #171

Merged
merged 1 commit into from
Sep 15, 2021
Merged

fix(conflicts): fix conflicts #171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,24 +327,6 @@ func validateIntervals(i *Intervals) {
*i.PeriodicSyncInterval = *i.PeriodicSyncMinInterval
logrus.Warnf("Please provide valid value for periodicSyncInterval. Continuing with default: %v", *i.PeriodicSyncInterval)
}
if i.PeriodicSyncInterval == nil {
i.PeriodicSyncInterval = i.PeriodicSyncMinInterval
} else if *i.PeriodicSyncInterval < *i.PeriodicSyncMinInterval {
*i.PeriodicSyncInterval = *i.PeriodicSyncMinInterval
logrus.Warnf("Please provide valid value for periodicSyncInterval. Continuing with default: %v", *i.PeriodicSyncInterval)
}

if i.PeriodicDeleteMinInterval == nil {
d := constants.DefaultPeriodicDeleteInterval
i.PeriodicDeleteMinInterval = &d
}
if i.PeriodicDeleteInterval == nil {
i.PeriodicDeleteInterval = i.PeriodicDeleteMinInterval
} else if *i.PeriodicDeleteInterval < *i.PeriodicDeleteMinInterval {
*i.PeriodicDeleteInterval = *i.PeriodicDeleteMinInterval
logrus.Warnf("Please provide valid value for periodicDeleteInterval. Continuing with default: %v", *i.PeriodicDeleteInterval)
}
}

if i.PeriodicDeleteMinInterval == nil {
d := constants.DefaultPeriodicDeleteInterval
Expand Down