去掉常驻任务逻辑

写了再去掉……

jobs/init.go

@@ -49,24 +49,3 @@ func runCmdWithTimeout(cmd *exec.Cmd, timeout time.Duration) (error, bool) {
 	}
 }
 
-//func stopCmd(cmd *exec.Cmd) (error,bool)  {
-//	done := make(chan error)
-//	go func() {
-//		done <- cmd.Wait()
-//	}()
-//
-//	var err error
-//	select {
-//	case <-time.After(timeout):
-//		beego.Warn(fmt.Sprintf("任务执行时间超过%d秒，进程将被强制杀掉: %d", int(timeout/time.Second), cmd.Process.Pid))
-//		go func() {
-//			<-done // 读出上面的goroutine数据，避免阻塞导致无法退出
-//		}()
-//		if err = cmd.Process.Kill(); err != nil {
-//			beego.Error(fmt.Sprintf("进程无法杀掉: %d, 错误信息: %s", cmd.Process.Pid, err))
-//		}
-//		return err, true
-//	case err = <-done:
-//		return err, false
-//	}
-//}

jobs/job.go

@@ -133,13 +133,7 @@ func (j *Job) Run() {
 	if j.task.Timeout > 0 {
 		timeout = time.Second * time.Duration(j.task.Timeout)
 	}
-
 	cmdOut, cmdErr, err, isTimeout := j.runFunc(timeout)
-	if err.Error() == "signal: killed" {
-		cmdOut += err.Error()
-		err = nil
-	}
-
 	ut := time.Now().Sub(t) / time.Millisecond
 
 	// 插入日志