From 4c8b38f40bdc5b1376dd026d86a2f34b3d51dbe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Tue, 8 Oct 2019 19:41:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=8A=B6=E6=80=81=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/services/task.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/backend/services/task.go b/backend/services/task.go
index 0e8db964..6b0effe6 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -14,10 +14,12 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"reflect"
 	"runtime"
 	"runtime/debug"
 	"strconv"
 	"sync"
+	"syscall"
 	"time"
 )
 
@@ -142,7 +144,7 @@ func ExecuteShellCmd(cmdStr string, cwd string, t model.Task, s model.Spider) (e
 		log.Infof("cancel process signal: %s", signal)
 		if signal == constants.TaskCancel && cmd.Process != nil {
 			// 取消进程
-			if err := cmd.Process.Kill(); err != nil {
+			if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL); err != nil {
 				log.Errorf("process kill error: %s", err.Error())
 				debug.PrintStack()
 			}
@@ -152,6 +154,7 @@ func ExecuteShellCmd(cmdStr string, cwd string, t model.Task, s model.Spider) (e
 			t.Status = constants.StatusFinished
 		}
 		t.FinishTs = time.Now()
+		t.Error = "user kill the process ..."
 		if err := t.Save(); err != nil {
 			log.Infof("save task error: %s", err.Error())
 			debug.PrintStack()
@@ -159,6 +162,8 @@ func ExecuteShellCmd(cmdStr string, cwd string, t model.Task, s model.Spider) (e
 		}
 	}()
 
+	// 在选择所有节点执行的时候，实际就是随机一个节点执行的，
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	// 异步启动进程
 	if err := cmd.Start(); err != nil {
 		log.Errorf("start spider error:{}", err.Error())
@@ -177,11 +182,12 @@ func ExecuteShellCmd(cmdStr string, cwd string, t model.Task, s model.Spider) (e
 		log.Errorf("wait process finish error: %s", err.Error())
 		debug.PrintStack()
 
+		log.Infof("error type is  : %s", reflect.TypeOf(err).String())
 		// 发生一次也需要保存
-		t.Error = err.Error()
-		t.FinishTs = time.Now()
-		t.Status = constants.StatusFinished
-		_ = t.Save()
+		//t.Error = err.Error()
+		//t.FinishTs = time.Now()
+		//t.Status = constants.StatusError
+		//_ = t.Save()
 		return err
 	}
 	ch <- constants.TaskFinish