7000历史节点心跳修改

src/spider/history.go

@@ -47,7 +47,7 @@ func (s *Spider) DownloadHistoryDetail() {
 		"comeintime": 0,
 		"event":      0,
 	}
-	UpdateHeart(s.Name, s.Channel, s.Code, s.MUserName, "detail") //记录采集三级页心跳
+	//UpdateHeart(s.Name, s.Channel, s.Code, s.MUserName, "detail") //记录采集三级页心跳
 	list, _ := MgoS.Find("spider_historydata", q, o, f, false, 0, 200)
 	if len(*list) == 0 { //数据量为0，表示无可下载数据，爬虫作废
 		s.Stop = true
@@ -72,7 +72,7 @@ func (s *Spider) DownloadHistoryDetail() {
 		}
 		//下载、解析、入库
 		data, err := s.DownloadDetailPage(tmp, data)
-		UpdateHeart(s.Name, s.Channel, s.Code, s.MUserName, "detailexcute") //下载数据心跳
+		//UpdateHeart(s.Name, s.Channel, s.Code, s.MUserName, "detailexcute") //下载数据心跳
 		if err != nil || data == nil {
 			success = false
 			if err != nil {

src/spider/spider.go

@@ -828,7 +828,7 @@ func (s *Spider) DownloadDetail(reload bool, isHistory bool) {
 		"comeintime": 0,
 		"event":      0,
 	}
-	if !s.Stop { //在下载详情页时爬虫下架，此时不再存心跳信息
+	if !isHistory && !s.Stop { //在下载详情页时爬虫下架，此时不再存心跳信息
 		UpdateHeart(s.Name, s.Channel, s.Code, s.MUserName, "detail") //记录modal=1采集三级页心跳
 	}
 	countNum := MgoS.Count(coll, q) //统计util.Config.DayNum天内未下载爬虫个数
@@ -932,7 +932,7 @@ func (s *Spider) DownloadDetail(reload bool, isHistory bool) {
 					}
 					//下载、解析、入库
 					data, err = sp.DownloadDetailPage(tmp, data)
-					if sp.IsMainThread && !sp.Stop { //在下载详情页时爬虫下架，此时不再存心跳信息
+					if !isHistory && !sp.Stop && sp.IsMainThread { //在下载详情页时爬虫下架，此时不再存心跳信息
 						UpdateHeart(s.Name, s.Channel, s.Code, s.MUserName, "detailexcute") //记录modal=1下载数据心跳
 					}
 					if err != nil || data == nil {