关闭日志打印

This commit is contained in:
陈景阳
2019-11-04 19:58:26 +08:00
parent 83cd00bfe4
commit cb0018ef87
2 changed files with 12 additions and 3 deletions

View File

@@ -136,8 +136,15 @@ func FinishOrCancelTask(ch chan string, cmd *exec.Cmd, t model.Task) {
log.Infof("process received signal: %s", signal)
if signal == constants.TaskCancel && cmd.Process != nil {
var err error
// 兼容windows
if runtime.GOOS == constants.Windows {
err = cmd.Process.Kill()
} else {
err = syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
}
// 取消进程
if err := syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL); err != nil {
if err != nil {
log.Errorf("process kill error: %s", err.Error())
debug.PrintStack()
@@ -225,7 +232,9 @@ func ExecuteShellCmd(cmdStr string, cwd string, t model.Task, s model.Spider) (e
go FinishOrCancelTask(ch, cmd, t)
// kill的时候可以kill所有的子进程
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
if runtime.GOOS != constants.Windows {
cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
}
// 启动进程
if err := StartTaskProcess(cmd, t); err != nil {

View File

@@ -37,6 +37,6 @@ func GetMessage(message redis.Message) *entity.NodeMessage {
func Close(c io.Closer) {
err := c.Close()
if err != nil {
log.WithError(err).Error("关闭资源文件失败。")
//log.WithError(err).Error("关闭资源文件失败。")
}
}