fixed unable to sync spiders to nodes error

This commit is contained in:
marvzhang
2020-02-03 16:08:43 +08:00
parent 81d9495148
commit 23f0b0c9e2
3 changed files with 13 additions and 5 deletions

View File

@@ -368,6 +368,8 @@ func InitSpiderService() error {
}
}
// 发布所有爬虫
PublishAllSpiders()
}
return nil

View File

@@ -4,6 +4,7 @@ import (
"crawlab/database"
"crawlab/model"
"crawlab/utils"
"fmt"
"github.com/apex/log"
"github.com/globalsign/mgo/bson"
"github.com/satori/go.uuid"
@@ -25,7 +26,7 @@ type SpiderSync struct {
func (s *SpiderSync) CreateMd5File(md5 string) {
path := filepath.Join(viper.GetString("spider.path"), s.Spider.Name)
utils.CreateFilePath(path)
utils.CreateDirPath(path)
fileName := filepath.Join(path, Md5File)
file := utils.OpenFile(fileName)
@@ -66,10 +67,14 @@ func (s *SpiderSync) RemoveSpiderFile() {
// 检测是否已经下载中
func (s *SpiderSync) CheckDownLoading(spiderId string, fileId string) (bool, string) {
key := s.GetLockDownloadKey(spiderId)
if _, err := database.RedisClient.HGet("spider", key); err == nil {
return true, key
key2, err := database.RedisClient.HGet("spider", key)
if err != nil {
return false, key2
}
return false, key
if key2 == "" {
return false, key2
}
return true, key2
}
// 下载爬虫
@@ -78,6 +83,7 @@ func (s *SpiderSync) Download() {
fileId := s.Spider.FileId.Hex()
isDownloading, key := s.CheckDownLoading(spiderId, fileId)
if isDownloading {
log.Infof(fmt.Sprintf("spider is already being downloaded, spider id: %s", s.Spider.Id.Hex()))
return
} else {
_ = database.RedisClient.HSet("spider", key, key)

View File

@@ -55,7 +55,7 @@ func OpenFile(fileName string) *os.File {
}
// 创建文件夹
func CreateFilePath(filePath string) {
func CreateDirPath(filePath string) {
if !Exists(filePath) {
if err := os.MkdirAll(filePath, os.ModePerm); err != nil {
log.Errorf("create file error: %s, file_path: %s", err.Error(), filePath)