From 57dddc84ed5fc9d34657c16567793c852cf2a423 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 12:42:53 +0800
Subject: [PATCH] =?UTF-8?q?FIX=20#178=20FIX=20=E5=BD=93=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=B0=8F=E4=BA=8E2048=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=8B=89=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  | 9 +++++++--
 backend/services/node.go | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/services/log.go b/backend/services/log.go
index c6e4f090..a248c176 100644
--- a/backend/services/log.go
+++ b/backend/services/log.go
@@ -35,8 +35,13 @@ func GetLocalLog(logPath string) (fileBytes []byte, err error) {
 	}
 	defer f.Close()
 	logBuf := make([]byte, 2048)
-	n, err := f.ReadAt(logBuf, fi.Size()-int64(len(logBuf)))
-	if err != nil {
+	off := int64(0)
+	if fi.Size() > int64(len(logBuf)) {
+		off = fi.Size() - int64(len(logBuf))
+	}
+	n, err := f.ReadAt(logBuf, off)
+	// 到文件结尾会有EOF的报错
+	if err.Error() != "EOF" && err != nil {
 		log.Error(err.Error())
 		debug.PrintStack()
 		return nil, err
diff --git a/backend/services/node.go b/backend/services/node.go
index 09b49dbf..083fdc3d 100644
--- a/backend/services/node.go
+++ b/backend/services/node.go
@@ -97,7 +97,7 @@ func GetCurrentNode() (model.Node, error) {
 					Key:      key,
 					Id:       bson.NewObjectId(),
 					Ip:       ip,
-					Name:     key,
+					Name:     ip,
 					Mac:      mac,
 					IsMaster: true,
 				}
@@ -205,7 +205,7 @@ func UpdateNodeStatus() {
 			// 数据库不存在该节点
 			node = model.Node{
 				Key:      key,
-				Name:     key,
+				Name:     data.Ip,
 				Ip:       data.Ip,
 				Port:     "8000",
 				Mac:      data.Mac,