Ver Fonte

7700节点更新

maxiaoshan há 2 anos atrás
pai
commit
633d0a9b65
3 ficheiros alterados com 11 adições e 14 exclusões
  1. 1 0
      src/luatask/task.go
  2. 9 13
      src/timetask/luamove.go
  3. 1 1
      src/timetask/report.go

+ 1 - 0
src/luatask/task.go

@@ -2076,6 +2076,7 @@ func CreateTask(t *Task, sp *Spider, upsertBulk *[][]map[string]interface{}, loc
 	}
 	list, _ := util.MgoEB.Find("task", query, nil, fields, false, -1, -1)
 	update := []map[string]interface{}{}
+	logger.Info("创建任务爬虫:", sp.Code)
 	if list != nil && len(*list) > 0 { //已有任务
 		if len(*list) > 1 {
 			logger.Error("Code:", sp.Code, "任务异常")

+ 9 - 13
src/timetask/luamove.go

@@ -98,7 +98,7 @@ func GetLuaInfo() {
 				cycletime = qu.IntAll(param_common[6])
 			}
 			lock.Lock()
-			if event != 7410 && event != 7700 {
+			if event != 7410 {
 				if util.CodeEventType[event] == 1 {
 					EventMapType1[event]++
 				} else if util.CodeEventType[event] == 2 {
@@ -217,25 +217,21 @@ func GetMoveLua() {
 	for _, sp := range CodeMap {
 		if sp.DataNum >= 500 && sp.FromEvent != 7410 && util.CodeEventType[sp.FromEvent] != 1 { //本身不是高性能节点超过500条的
 			sp.IsMove = true
-			if sp.FromEvent == 7700 { //7700、7410节点特殊性
-				sp.ToEvent = 7410
-			} else {
-				sp.ToEvent = EventArrType1[0].Event
-			}
-		} else if sp.DataNum >= 10 && sp.DataNum < 500 && sp.FromEvent != 7700 && sp.FromEvent != 7410 && util.CodeEventType[sp.FromEvent] != 2 {
+			sp.ToEvent = EventArrType1[0].Event
+		} else if sp.DataNum >= 10 && sp.DataNum < 500 && sp.FromEvent != 7410 && util.CodeEventType[sp.FromEvent] != 2 {
 			sp.IsMove = true
 			sp.ToEvent = EventArrType2[0].Event
-		} else if sp.DataNum > 0 && sp.DataNum < 10 && sp.FromEvent != 7700 && util.CodeEventType[sp.FromEvent] != 3 {
+		} else if sp.DataNum > 0 && sp.DataNum < 10 && util.CodeEventType[sp.FromEvent] != 3 {
 			sp.IsMove = true
-			if sp.FromEvent == 7410 { //7700、7410节点特殊性
-				sp.ToEvent = 7700
+			if sp.FromEvent == 7410 { //7410节点特殊性,此处表示7410节点的爬虫要更新采集频率
+				sp.ToEvent = 7410
 			} else {
 				sp.ToEvent = EventArrType3[0].Event
 			}
-		} else if sp.DataNum == 0 && sp.FromEvent != 7700 && util.CodeEventType[sp.FromEvent] != 4 {
+		} else if sp.DataNum == 0 && util.CodeEventType[sp.FromEvent] != 4 {
 			sp.IsMove = true
-			if sp.FromEvent == 7410 { //7700、7410节点特殊性
-				sp.ToEvent = 7700
+			if sp.FromEvent == 7410 { //7410节点特殊性,此处表示7410节点的爬虫要更新采集频率
+				sp.ToEvent = 7410
 			} else {
 				sp.ToEvent = 7520
 			}

+ 1 - 1
src/timetask/report.go

@@ -35,7 +35,7 @@ func SpiderWeeklyReport() {
 		LastWeekEsNum,                              //上周es数量
 		LastWeekCompeteMgoNum,                      //上周竞品采集mgo数量
 		LastWeekCompeteEsNum := GetLastWeekReport() //上周竞品采集es数量
-
+	qu.Debug(LastWeekAddTaskAllNum, LastWeekAddLuaNum, LastWeekAddEffectTaskNum)
 	//1、任务相关
 	//上周新建任务数量
 	qu.Debug("上周新建任务数量:", LastWeekAddTaskAllNum)