fix 删除爬虫的问题

backend/services/msg_handler/handler.go

@@ -2,47 +2,34 @@ package msg_handler
 
 import (
 	"crawlab/constants"
-	"crawlab/model"
+	"crawlab/entity"
 )
 
 type Handler interface {
 	Handle() error
 }
 
-func GetMsgHandler(msg NodeMessage) Handler {
+func GetMsgHandler(msg entity.NodeMessage) Handler {
 	if msg.Type == constants.MsgTypeGetLog || msg.Type == constants.MsgTypeRemoveLog {
+		// 日志相关
 		return &Log{
 			msg: msg,
 		}
 	} else if msg.Type == constants.MsgTypeCancelTask {
+		// 任务相关
 		return &Task{
 			msg: msg,
 		}
 	} else if msg.Type == constants.MsgTypeGetSystemInfo {
+		// 系统信息相关
 		return &SystemInfo{
 			msg: msg,
 		}
+	} else if msg.Type == constants.MsgTypeRemoveSpider {
+		// 爬虫相关
+		return &Spider{
+			SpiderId: msg.SpiderId,
+		}
 	}
 	return nil
 }
-
-type NodeMessage struct {
-	// 通信类别
-	Type string `json:"type"`
-
-	// 任务相关
-	TaskId string `json:"task_id"` // 任务ID
-
-	// 节点相关
-	NodeId string `json:"node_id"` // 节点ID
-
-	// 日志相关
-	LogPath string `json:"log_path"` // 日志路径
-	Log     string `json:"log"`      // 日志
-
-	// 系统信息
-	SysInfo model.SystemInfo `json:"sys_info"`
-
-	// 错误相关
-	Error string `json:"error"`
-}

backend/services/msg_handler/msg_log.go

@@ -2,16 +2,15 @@ package msg_handler
 
 import (
 	"crawlab/constants"
-	"crawlab/database"
+	"crawlab/entity"
 	"crawlab/model"
 	"crawlab/utils"
-	"encoding/json"
 	"github.com/apex/log"
 	"runtime/debug"
 )
 
 type Log struct {
-	msg NodeMessage
+	msg entity.NodeMessage
 }
 
 func (g *Log) Handle() error {
@@ -25,31 +24,22 @@ func (g *Log) Handle() error {
 
 func (g *Log) get() error {
 	// 发出的消息
-	msgSd := NodeMessage{
+	msgSd := entity.NodeMessage{
 		Type:   constants.MsgTypeGetLog,
 		TaskId: g.msg.TaskId,
 	}
 	// 获取本地日志
 	logStr, err := model.GetLocalLog(g.msg.LogPath)
-	log.Info(utils.BytesToString(logStr))
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorf("get node local log error: %s", err.Error())
 		debug.PrintStack()
 		msgSd.Error = err.Error()
 		msgSd.Log = err.Error()
 	} else {
 		msgSd.Log = utils.BytesToString(logStr)
 	}
-
-	// 序列化
-	msgSdBytes, err := json.Marshal(&msgSd)
-	if err != nil {
-		return err
-	}
-
 	// 发布消息给主节点
-	log.Info("publish get log msg to master")
-	if _, err := database.RedisClient.Publish("nodes:master", utils.BytesToString(msgSdBytes)); err != nil {
+	if err := utils.Pub(constants.ChannelMasterNode, msgSd); err != nil {
 		return err
 	}
 	return nil

backend/services/msg_handler/msg_spider.go

@@ -0,0 +1,24 @@
+package msg_handler
+
+import (
+	"crawlab/model"
+	"crawlab/utils"
+	"github.com/globalsign/mgo/bson"
+	"github.com/spf13/viper"
+	"path/filepath"
+)
+
+type Spider struct {
+	SpiderId string
+}
+
+func (s *Spider) Handle() error {
+	// 移除本地的爬虫目录
+	spider, err := model.GetSpider(bson.ObjectIdHex(s.SpiderId))
+	if err != nil {
+		return err
+	}
+	path := filepath.Join(viper.GetString("spider.path"), spider.Name)
+	utils.RemoveFiles(path)
+	return nil
+}

backend/services/msg_handler/msg_system_info.go

@@ -2,16 +2,13 @@ package msg_handler
 
 import (
 	"crawlab/constants"
-	"crawlab/database"
+	"crawlab/entity"
 	"crawlab/model"
 	"crawlab/utils"
-	"encoding/json"
-	"github.com/apex/log"
-	"runtime/debug"
 )
 
 type SystemInfo struct {
-	msg NodeMessage
+	msg entity.NodeMessage
 }
 
 func (s *SystemInfo) Handle() error {
@@ -20,19 +17,12 @@ func (s *SystemInfo) Handle() error {
 	if err != nil {
 		return err
 	}
-	msgSd := NodeMessage{
+	msgSd := entity.NodeMessage{
 		Type:    constants.MsgTypeGetSystemInfo,
 		NodeId:  s.msg.NodeId,
 		SysInfo: sysInfo,
 	}
-	msgSdBytes, err := json.Marshal(&msgSd)
-	if err != nil {
-		log.Errorf(err.Error())
-		debug.PrintStack()
-		return err
-	}
-	if _, err := database.RedisClient.Publish("nodes:master", utils.BytesToString(msgSdBytes)); err != nil {
-		log.Errorf(err.Error())
+	if err := utils.Pub(constants.ChannelMasterNode, msgSd); err != nil {
 		return err
 	}
 	return nil

backend/services/msg_handler/msg_task.go

@@ -2,6 +2,7 @@ package msg_handler
 
 import (
 	"crawlab/constants"
+	"crawlab/entity"
 	"crawlab/model"
 	"crawlab/utils"
 	"github.com/apex/log"
@@ -10,7 +11,7 @@ import (
 )
 
 type Task struct {
-	msg NodeMessage
+	msg entity.NodeMessage
 }
 
 func (t *Task) Handle() error {