From 04924b2f199c2fbc017067d0233c2d82379a26b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Fri, 11 Oct 2019 23:22:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/services/log.go  | 11 +++++++++--
 backend/services/task.go |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/backend/services/log.go b/backend/services/log.go
index 485cb7dd..81140c0a 100644
--- a/backend/services/log.go
+++ b/backend/services/log.go
@@ -15,6 +15,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime/debug"
+	"time"
 )
 
 // 任务日志频道映射
@@ -45,8 +46,14 @@ func GetRemoteLog(task model.Task) (logStr string, err error) {
 	// 生成频道，等待获取log
 	ch := TaskLogChanMap.ChanBlocked(task.Id)
 
-	// 此处阻塞，等待结果
-	logStr = <-ch
+	select {
+	case logStr = <-ch:
+		log.Infof("get remote log")
+		break
+	case <-time.After(5 * time.Second):
+		logStr = "get remote log timeout"
+		break
+	}
 
 	return logStr, nil
 }
diff --git a/backend/services/task.go b/backend/services/task.go
index f515f48d..12f0330e 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -285,6 +285,9 @@ func ExecuteTask(id int) {
 	// 节点队列任务
 	var msg string
 	msg, err = database.RedisClient.LPop(queueCur)
+	if msg != "" {
+		log.Infof("queue cur: %s", msg)
+	}
 	if err != nil {
 		if msg == "" {
 			// 节点队列没有任务，获取公共队列任务