Refactor to remove some nesting

This commit is contained in:
Deluan
2021-05-06 20:49:26 -04:00
parent 1f8949929d
commit 47f4e0a4de
+4 -4
View File
@@ -133,7 +133,9 @@ func validateScanSchedule() error {
log.Warn("Setting ScanSchedule", "schedule", Server.ScanSchedule) log.Warn("Setting ScanSchedule", "schedule", Server.ScanSchedule)
} }
} }
if Server.ScanSchedule != "" { if Server.ScanSchedule == "" {
return nil
}
if _, err := time.ParseDuration(Server.ScanSchedule); err == nil { if _, err := time.ParseDuration(Server.ScanSchedule); err == nil {
Server.ScanSchedule = "@every " + Server.ScanSchedule Server.ScanSchedule = "@every " + Server.ScanSchedule
} }
@@ -141,10 +143,8 @@ func validateScanSchedule() error {
_, err := c.AddFunc(Server.ScanSchedule, func() {}) _, err := c.AddFunc(Server.ScanSchedule, func() {})
if err != nil { if err != nil {
log.Error("Invalid ScanSchedule. Please read format spec at https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format", "schedule", Server.ScanSchedule, err) log.Error("Invalid ScanSchedule. Please read format spec at https://pkg.go.dev/github.com/robfig/cron#hdr-CRON_Expression_Format", "schedule", Server.ScanSchedule, err)
}
return err return err
}
}
return nil
} }
// AddHook is used to register initialization code that should run as soon as the config is loaded // AddHook is used to register initialization code that should run as soon as the config is loaded