Add web demo

Author: memory-overflow

container/combination_container.go

@@ -160,3 +160,15 @@ func (c *combinationContainer) UpdateRunningTaskStatus(ctx context.Context,
 	}
 	return nil
 }
+
+// SaveData 导出任务输出，自行处理任务结果
+func (c *combinationContainer) SaveData(ctx context.Context, ftask *lighttaskscheduler.Task,
+	data interface{}) error {
+	if err := c.memeoryContainer.SaveData(ctx, ftask, data); err != nil {
+		return err
+	}
+	if err := c.persistContainer.SaveData(ctx, ftask, data); err != nil {
+		return err
+	}
+	return nil
+}

container/memory_container/queue_container.go

@@ -168,7 +168,7 @@ func (q *queueContainer) UpdateRunningTaskStatus(ctx context.Context,
 	return nil
 }
 
-// ExportOutput 导出任务输出，自行处理任务结果
+// SaveData 保存任务结果
 func (q *queueContainer) SaveData(ctx context.Context, ftask *lighttaskscheduler.Task,
 	data interface{}) error {
 	if q.savefunc != nil {

example/videocut_example/main.go …ample/videocut_example/main_demo/main.goexample/videocut_example/main.go renamed to example/videocut_example/main_demo/main.go example/videocut_example/main.go renamed to example/videocut_example/main_demo/main.go

@@ -0,0 +1,41 @@
+package main
+
+import (
+	"context"
+	"log"
+	"time"
+
+	lighttaskscheduler "github.com/memory-overflow/light-task-scheduler"
+	"github.com/memory-overflow/light-task-scheduler/container"
+	memeorycontainer "github.com/memory-overflow/light-task-scheduler/container/memory_container"
+	videocut "github.com/memory-overflow/light-task-scheduler/example/videocut_example/video_cut"
+)
+
+func main() {
+
+	// 构建队列容器，队列长度 10000
+	queueContainer := memeorycontainer.MakeQueueContainer(10000, 100*time.Millisecond, nil)
+	scanInterval := 50 * time.Millisecond
+	// 替换自己的数据库
+	sqlContainer, err := videocut.MakeVideoCutSqlContainer("127.0.0.1", "3306", "root", "", "test")
+	if err != nil {
+		log.Fatalf("build container failed: %v\n", err)
+	}
+
+	comb := container.MakeCombinationContainer(queueContainer, sqlContainer)
+	// 构建裁剪任务执行器
+	actuator := videocut.MakeVideoCutActuator()
+	sch := lighttaskscheduler.MakeNewScheduler(
+		context.Background(),
+		comb, actuator,
+		lighttaskscheduler.Config{
+			TaskLimit:             2, // 2 并发
+			ScanInterval:          scanInterval,
+			TaskTimeout:           120 * time.Second, // 120s 超时时间
+			EnableFinshedTaskList: false,             // 开启已完成任务返回功能
+		},
+	)
+
+	go videocut.StartServer()                  // start video cut microservice
+	videocut.StartWebServer(sqlContainer, sch) // start web server
+}

example/videocut_example/main_web/main.go

@@ -68,7 +68,7 @@ func (e *videoCutSqlContainer) AddTask(ctx context.Context, ftask framework.Task
 
 	task, ok := ftask.TaskItem.(VideoCutTask)
 	if !ok {
-		return fmt.Errorf("TaskItem not be set to AddTask")
+		return fmt.Errorf("TaskItem not be set to VideoCutTask")
 	}
 	db := e.db
 	t := time.Now()
@@ -158,7 +158,7 @@ func (e *videoCutSqlContainer) ToRunningStatus(ctx context.Context, ftask *frame
 	}()
 	task, ok := ftask.TaskItem.(VideoCutTask)
 	if !ok {
-		return ftask, fmt.Errorf("TaskItem not be set to AddTask")
+		return ftask, fmt.Errorf("TaskItem not be set to VideoCutTask")
 	}
 	db := e.db
 	t := time.Now()
@@ -191,14 +191,16 @@ func (e *videoCutSqlContainer) ToStopStatus(ctx context.Context, ftask *framewor
 
 	task, ok := ftask.TaskItem.(VideoCutTask)
 	if !ok {
-		return ftask, fmt.Errorf("TaskItem not be set to AddTask")
+		return ftask, fmt.Errorf("TaskItem not be set to VideoCutTask")
 	}
 	db := e.db
-	sql := db.Model(&VideoCutTask{}).Where("task_id = ? and status = ?", ftask.TaskId, ftask.TaskStatus).
+	db = db.Debug()
+	sql := db.Model(&VideoCutTask{}).Where("task_id = ? and status = ?", task.TaskId, task.Status).
 		Update("status", framework.TASK_STATUS_STOPED)
 	if sql.Error != nil {
 		return ftask, fmt.Errorf("db update error: %v", sql.Error)
 	}
+	fmt.Println(sql.RowsAffected)
 	if sql.RowsAffected == 0 {
 		return ftask, fmt.Errorf("task %s not found, may status has been changed", task.TaskId)
 	}
@@ -217,10 +219,10 @@ func (e *videoCutSqlContainer) ToDeleteStatus(ctx context.Context, ftask *framew
 	}()
 	task, ok := ftask.TaskItem.(VideoCutTask)
 	if !ok {
-		return ftask, fmt.Errorf("TaskItem not be set to AddTask")
+		return ftask, fmt.Errorf("TaskItem not be set to VideoCutTask")
 	}
 	db := e.db
-	sql := db.Model(&VideoCutTask{}).Delete("task_id = ? and status = ?", ftask.TaskId, ftask.TaskStatus)
+	sql := db.Where("task_id = ? and status = ?", task.TaskId, task.Status).Delete(&VideoCutTask{})
 	if sql.Error != nil {
 		return ftask, fmt.Errorf("db delete error: %v", sql.Error)
 	}
@@ -242,7 +244,7 @@ func (e *videoCutSqlContainer) ToFailedStatus(ctx context.Context, ftask *framew
 	}()
 	task, ok := ftask.TaskItem.(VideoCutTask)
 	if !ok {
-		return ftask, fmt.Errorf("TaskItem not be set to AddTask")
+		return ftask, fmt.Errorf("TaskItem not be set to VideoCutTask")
 	}
 	db := e.db
 	t := time.Now()
@@ -275,7 +277,7 @@ func (e *videoCutSqlContainer) ToExportStatus(ctx context.Context, ftask *framew
 	}()
 	task, ok := ftask.TaskItem.(VideoCutTask)
 	if !ok {
-		return ftask, fmt.Errorf("TaskItem not be set to AddTask")
+		return ftask, fmt.Errorf("TaskItem not be set to VideoCutTask")
 	}
 	db := e.db
 	sql := db.Model(&VideoCutTask{}).Where("task_id = ? and status = ?", ftask.TaskId, ftask.TaskStatus).
@@ -301,7 +303,7 @@ func (e *videoCutSqlContainer) ToSuccessStatus(ctx context.Context, ftask *frame
 	}()
 	task, ok := ftask.TaskItem.(VideoCutTask)
 	if !ok {
-		return ftask, fmt.Errorf("TaskItem not be set to AddTask")
+		return ftask, fmt.Errorf("TaskItem not be set to VideoCutTask")
 	}
 	db := e.db
 	t := time.Now()
@@ -340,7 +342,7 @@ func (e *videoCutSqlContainer) SaveData(ctx context.Context, ftask *framework.Ta
 
 	task, ok := ftask.TaskItem.(VideoCutTask)
 	if !ok {
-		return fmt.Errorf("TaskItem not be set to AddTask")
+		return fmt.Errorf("TaskItem not be set to VideoCutTask")
 	}
 	db := e.db
 	outputVideo, ok := data.(string)