|
@@ -547,21 +547,27 @@ func UpdateSpiderByCodeState(code, state string) (bool, error) {
|
|
|
} else {
|
|
|
logger.Info("上架新增脚本,新增队列中位置", listsize)
|
|
|
LoopListPath.Store(listsize, v) //上架
|
|
|
- //校验是否上架成功
|
|
|
- listsize, count_ok, count_no = 0, 0, 0
|
|
|
- LoopListPath.Range(func(key, val interface{}) bool {
|
|
|
- listsize++
|
|
|
- if tmp, ok := val.(map[string]string); ok {
|
|
|
- count_ok++
|
|
|
- if tmp["code"] == code { //队列存在
|
|
|
- logger.Info("上架脚本成功", code, "队列中位置", key)
|
|
|
- }
|
|
|
- } else {
|
|
|
- count_no++
|
|
|
+ }
|
|
|
+ //校验是否上架成功
|
|
|
+ saveList := false //记录是否上架成功
|
|
|
+ listsize, count_ok, count_no = 0, 0, 0
|
|
|
+ LoopListPath.Range(func(key, val interface{}) bool {
|
|
|
+ listsize++
|
|
|
+ if tmp, ok := val.(map[string]string); ok {
|
|
|
+ count_ok++
|
|
|
+ if tmp["code"] == code { //队列存在
|
|
|
+ saveList = true
|
|
|
+ logger.Info("上架脚本成功", code, "队列中位置", key)
|
|
|
}
|
|
|
- return true
|
|
|
- })
|
|
|
- logger.Info("上架爬虫后队列中共有爬虫", listsize, "当前在线数量:", count_ok, "下线数量:", count_no)
|
|
|
+ } else {
|
|
|
+ count_no++
|
|
|
+ }
|
|
|
+ return true
|
|
|
+ })
|
|
|
+ logger.Info("上架爬虫后队列中共有爬虫", listsize, "当前在线数量:", count_ok, "下线数量:", count_no)
|
|
|
+ if !saveList { //上架失败
|
|
|
+ logger.Info("上架脚本", code, " 失败")
|
|
|
+ return false, errors.New("use " + code + " failed")
|
|
|
}
|
|
|
}
|
|
|
logger.Info("上架新增脚本", code)
|