From c7e137a6aa04f627db0a5c98e51a09c793c3b23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=99=AF=E9=98=B3?= <1656488874@qq.com>
Date: Tue, 27 Aug 2019 09:39:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=88=AC=E8=99=AB=E9=A1=BA?=
 =?UTF-8?q?=E5=B8=A6=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/model/spider.go    | 11 +++++++++--
 backend/routes/utils.go    |  2 ++
 backend/services/spider.go |  2 +-
 backend/services/task.go   |  1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/backend/model/spider.go b/backend/model/spider.go
index c4c94edf..65782fe8 100644
--- a/backend/model/spider.go
+++ b/backend/model/spider.go
@@ -92,8 +92,6 @@ func (spider *Spider) GetLastTask() (Task, error) {
 	return tasks[0], nil
 }
 
-
-
 func GetSpiderList(filter interface{}, skip int, limit int) ([]Spider, error) {
 	s, c := database.GetCol("spiders")
 	defer s.Close()
@@ -165,6 +163,15 @@ func RemoveSpider(id bson.ObjectId) error {
 		return err
 	}
 
+	// gf上的文件
+	s, gf := database.GetGridFs("files")
+	defer s.Close()
+
+	if err := gf.RemoveId(result.FileId); err != nil {
+		log.Error("remove file error, id:" + result.FileId.Hex())
+		return err
+	}
+
 	return nil
 }
 
diff --git a/backend/routes/utils.go b/backend/routes/utils.go
index 14c5853e..8044ffc9 100644
--- a/backend/routes/utils.go
+++ b/backend/routes/utils.go
@@ -1,11 +1,13 @@
 package routes
 
 import (
+	"github.com/apex/log"
 	"github.com/gin-gonic/gin"
 	"runtime/debug"
 )
 
 func HandleError(statusCode int, c *gin.Context, err error) {
+	log.Errorf("handle error:" + err.Error())
 	debug.PrintStack()
 	c.JSON(statusCode, Response{
 		Status:  "ok",
diff --git a/backend/services/spider.go b/backend/services/spider.go
index f4f856e6..5c5c6e6e 100644
--- a/backend/services/spider.go
+++ b/backend/services/spider.go
@@ -320,7 +320,7 @@ func OnFileUpload(channel string, msgStr string) {
 	// 从GridFS获取该文件
 	f, err := gf.OpenId(bson.ObjectIdHex(msg.FileId))
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorf("open file id" + msg.FileId + ", error: " + err.Error())
 		debug.PrintStack()
 		return
 	}
diff --git a/backend/services/task.go b/backend/services/task.go
index 8c0ff8a1..8c3c3407 100644
--- a/backend/services/task.go
+++ b/backend/services/task.go
@@ -472,6 +472,7 @@ func CancelTask(id string) (err error) {
 }
 
 func HandleTaskError(t model.Task, err error) {
+	log.Error("handle task error:" + err.Error())
 	t.Status = constants.StatusError
 	t.Error = err.Error()
 	t.FinishTs = time.Now()