From 82999225de701b875edee66adfeffc10d5d5ea0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Wed, 25 Sep 2019 15:11:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96task?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/services/task.go           | 12 ++++++++++--
 frontend/src/store/modules/task.js |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/backend/services/task.go b/backend/services/task.go
index 53c96b6b..216bdfb7 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -447,6 +447,8 @@ func CancelTask(id string) (err error) {
 	// 获取任务
 	task, err := model.GetTask(id)
 	if err != nil {
+		log.Errorf("task not found, task id : %s, error: %s", id, err.Error())
+		debug.PrintStack()
 		return err
 	}
 
@@ -458,6 +460,8 @@ func CancelTask(id string) (err error) {
 	// 获取当前节点（默认当前节点为主节点）
 	node, err := GetCurrentNode()
 	if err != nil {
+		log.Errorf("get current node error: %s", err.Error())
+		debug.PrintStack()
 		return err
 	}
 
@@ -466,9 +470,13 @@ func CancelTask(id string) (err error) {
 
 		// 获取任务执行频道
 		ch := utils.TaskExecChanMap.ChanBlocked(id)
+		if ch != nil {
+			// 发出取消进程信号
+			ch <- constants.TaskCancel
+		} else {
+			model.
+		}
 
-		// 发出取消进程信号
-		ch <- constants.TaskCancel
 	} else {
 		// 任务节点为工作节点
 
diff --git a/frontend/src/store/modules/task.js b/frontend/src/store/modules/task.js
index 1d7e6c09..bb182706 100644
--- a/frontend/src/store/modules/task.js
+++ b/frontend/src/store/modules/task.js
@@ -139,7 +139,7 @@ const actions = {
   cancelTask ({ state, dispatch }, id) {
     return request.post(`/tasks/${id}/cancel`)
       .then(() => {
-        dispatch('getTaskData')
+        dispatch('getTaskData', id)
       })
   }
 }