Merge pull request #4512 from fuweid/14-cherry-pick-4486

AkihiroSuda · web-flow · commit 1a3677627dde · 2020-08-30T05:34:26.000+09:00
[release/1.4] tasks: Monitor v2 tasks in initFunc as well
diff --git a/services/tasks/local.go b/services/tasks/local.go
@@ -118,6 +118,13 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {
 			l.monitor.Monitor(t)
 		}
 	}
+	v2Tasks, err := l.v2Runtime.Tasks(ic.Context, true)
+	if err != nil {
+		return nil, err
+	}
+	for _, t := range v2Tasks {
+		l.monitor.Monitor(t)
+	}
 	return l, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,13 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {`
`118`	`118`	`l.monitor.Monitor(t)`
`119`	`119`	`}`
`120`	`120`	`}`
	`121`	`+ v2Tasks, err := l.v2Runtime.Tasks(ic.Context, true)`
	`122`	`+ if err != nil {`
	`123`	`+ return nil, err`
	`124`	`+ }`
	`125`	`+ for _, t := range v2Tasks {`
	`126`	`+ l.monitor.Monitor(t)`
	`127`	`+ }`
`121`	`128`	`return l, nil`
`122`	`129`	`}`
`123`	`130`