Merge pull request #1479 from nono/ignore-missing-triggers

jinroh · web-flow · commit 37f07a8d37a1 · 2018-08-06T11:24:08.000+02:00
Ignore missing triggers when updating an app
diff --git a/pkg/apps/webapp.go b/pkg/apps/webapp.go
@@ -329,7 +329,7 @@ func diffServices(db prefixer.Prefixer, slug string, oldServices, newServices Se
 
 	sched := jobs.System()
 	for _, service := range deleted {
-		if err := sched.DeleteTrigger(db, service.TriggerID); err != nil {
+		if err := sched.DeleteTrigger(db, service.TriggerID); err != nil && err != jobs.ErrNotFoundTrigger {
 			return err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ func diffServices(db prefixer.Prefixer, slug string, oldServices, newServices Se`
`329`	`329`
`330`	`330`	`sched := jobs.System()`
`331`	`331`	`for _, service := range deleted {`
`332`		`- if err := sched.DeleteTrigger(db, service.TriggerID); err != nil {`
	`332`	`+ if err := sched.DeleteTrigger(db, service.TriggerID); err != nil && err != jobs.ErrNotFoundTrigger {`
`333`	`333`	`return err`
`334`	`334`	`}`
`335`	`335`	`}`