add context.Context

Author: devfeel

crontask.go

@@ -121,16 +121,16 @@ func NewCronTask(taskID string, isRun bool, express string, handler TaskHandle,
 	task.IsRun = isRun
 	task.handler = handler
 	task.RawExpress = express
-	expresslist := strings.Split(express, " ")
-	if len(expresslist) != 6 {
+	expressList := strings.Split(express, " ")
+	if len(expressList) != 6 {
 		return nil, errors.New("express is wrong format => not 6 parts")
 	}
-	task.time_WeekDay = parseExpress(expresslist[5], ExpressType_WeekDay)
-	task.time_Month = parseExpress(expresslist[4], ExpressType_Month)
-	task.time_Day = parseExpress(expresslist[3], ExpressType_Day)
-	task.time_Hour = parseExpress(expresslist[2], ExpressType_Hour)
-	task.time_Minute = parseExpress(expresslist[1], ExpressType_Minute)
-	task.time_Second = parseExpress(expresslist[0], ExpressType_Second)
+	task.time_WeekDay = parseExpress(expressList[5], ExpressType_WeekDay)
+	task.time_Month = parseExpress(expressList[4], ExpressType_Month)
+	task.time_Day = parseExpress(expressList[3], ExpressType_Day)
+	task.time_Hour = parseExpress(expressList[2], ExpressType_Hour)
+	task.time_Minute = parseExpress(expressList[1], ExpressType_Minute)
+	task.time_Second = parseExpress(expressList[0], ExpressType_Second)
 
 	task.State = TaskState_Init
 	task.context = context

example/timeout/main.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"time"
+)
+
+func main() {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+	query(ctx)
+
+	time.Sleep(time.Hour)
+}
+
+func query(ctx context.Context) {
+	notifyChan := make(chan string)
+	doing := func() {
+		time.Sleep(time.Second)
+		fmt.Println("1:", time.Now())
+		time.Sleep(time.Second * 3)
+		fmt.Println("2:", time.Now())
+		time.Sleep(time.Second * 5)
+		fmt.Println("3:", time.Now())
+		notifyChan <- "1"
+	}
+	go doing()
+	select {
+	case <-notifyChan:
+		fmt.Println("done")
+	case <-ctx.Done():
+		fmt.Println("timeout")
+	}
+}

taskinfo.go

@@ -1,6 +1,7 @@
 package task
 
 import (
+	"context"
 	"sync"
 	"time"
 )
@@ -47,6 +48,7 @@ type (
 		IsEnd    bool        //如果设置该属性为true，则停止当次任务的后续执行，一般用在OnBegin中
 		Error    error
 		Header   map[string]interface{}
+		Context  context.Context
 	}
 
 	CounterInfo struct {