Merge pull request #6585 from dokku/cron-errors
Add more context to errors in fetching cron entries
This commit is contained in:
@@ -59,7 +59,7 @@ func FetchCronEntries(appName string) ([]TemplateCommand, error) {
|
|||||||
commands := []TemplateCommand{}
|
commands := []TemplateCommand{}
|
||||||
appJSON, err := appjson.GetAppJSON(appName)
|
appJSON, err := appjson.GetAppJSON(appName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return commands, err
|
return commands, fmt.Errorf("Unable to fetch app.json for app %s: %s", appName, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
if appJSON.Cron == nil {
|
if appJSON.Cron == nil {
|
||||||
@@ -70,7 +70,7 @@ func FetchCronEntries(appName string) ([]TemplateCommand, error) {
|
|||||||
parser := cronparser.NewParser(cronparser.Minute | cronparser.Hour | cronparser.Dom | cronparser.Month | cronparser.Dow | cronparser.Descriptor)
|
parser := cronparser.NewParser(cronparser.Minute | cronparser.Hour | cronparser.Dom | cronparser.Month | cronparser.Dow | cronparser.Descriptor)
|
||||||
_, err := parser.Parse(c.Schedule)
|
_, err := parser.Parse(c.Schedule)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return commands, err
|
return commands, fmt.Errorf("Invalid cron schedule %s: %s", c.Schedule, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
commands = append(commands, TemplateCommand{
|
commands = append(commands, TemplateCommand{
|
||||||
|
|||||||
Reference in New Issue
Block a user