From 1877677844fa2e165fddb7215dd5b0c55d4b0d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Sat, 31 Aug 2019 15:03:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=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/log.go  | 2 +-
 backend/services/node.go | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/services/log.go b/backend/services/log.go
index a248c176..a0ba0311 100644
--- a/backend/services/log.go
+++ b/backend/services/log.go
@@ -41,7 +41,7 @@ func GetLocalLog(logPath string) (fileBytes []byte, err error) {
 	}
 	n, err := f.ReadAt(logBuf, off)
 	// 到文件结尾会有EOF的报错
-	if err.Error() != "EOF" && err != nil {
+	if err != nil && err.Error() != "EOF" {
 		log.Error(err.Error())
 		debug.PrintStack()
 		return nil, err
diff --git a/backend/services/node.go b/backend/services/node.go
index 977ff0ef..124f5bba 100644
--- a/backend/services/node.go
+++ b/backend/services/node.go
@@ -308,8 +308,10 @@ func WorkerNodeCallback(channel string, msgStr string) {
 			log.Errorf(err.Error())
 			debug.PrintStack()
 			msgSd.Error = err.Error()
+			msgSd.Log = err.Error()
+		} else {
+			msgSd.Log = string(logStr)
 		}
-		msgSd.Log = string(logStr)
 
 		// 序列化
 		msgSdBytes, err := json.Marshal(&msgSd)