Selaa lähdekoodia

更新心跳定时更新

maxiaoshan 3 vuotta sitten
vanhempi
commit
d81b1030ee
2 muutettua tiedostoa jossa 18 lisäystä ja 4 poistoa
  1. 11 4
      src/timetask/timetask.go
  2. 7 0
      src/util/util.go

+ 11 - 4
src/timetask/timetask.go

@@ -8,7 +8,6 @@ import (
 	"net/smtp"
 	qu "qfw/util"
 	mgdb "qfw/util/mongodb"
-	mgu "qfw/util/mongodbutil"
 	sp "spiderutil"
 	"strconv"
 	"strings"
@@ -188,13 +187,21 @@ func UpdateCodeHeart() {
 	qu.Debug("定时更新爬虫心跳信息...")
 	defer qu.Catch()
 	query := map[string]interface{}{
-		"state": map[string]interface{}{
-			"$in": []int{4, 6, 7, 8, 9, 10, 11},
+		"$or": []interface{}{
+			map[string]interface{}{
+				"platform": "python",
+			},
+			map[string]interface{}{
+				"state": map[string]interface{}{
+					"$in": []int{4, 6, 7, 8, 9, 10, 11},
+				},
+			},
 		},
 	}
 	list, _ := util.MgoE.Find("luaconfig", query, nil, map[string]interface{}{"code": 1}, false, -1, -1)
+	qu.Debug("定时更新爬虫心跳信息个数:", len(*list))
 	for _, l := range *list {
-		mgu.Update("spider_heart", "spider", "spider", map[string]interface{}{"code": l["code"]}, map[string]interface{}{
+		util.MgoS.Update("spider_heart", map[string]interface{}{"code": l["code"]}, map[string]interface{}{
 			"$set": map[string]interface{}{"del": true},
 		}, false, true)
 	}

+ 7 - 0
src/util/util.go

@@ -15,6 +15,7 @@ import (
 
 var (
 	MgoE            *mgo.MongodbSim
+	MgoS            *mgo.MongodbSim
 	Province        map[string][]string
 	DomainNameReg   = regexp.MustCompile(`(http|https)[::]+`)
 	DownLoadReg     = regexp.MustCompile(`download\(.*?\)`)
@@ -87,6 +88,12 @@ func InitMgo() {
 		Size:        5,
 	}
 	MgoE.InitPool()
+	MgoS = &mgo.MongodbSim{
+		MongodbAddr: sp.Config.Dbaddr,
+		DbName:      sp.Config.Dbname2,
+		Size:        5,
+	}
+	MgoS.InitPool()
 }
 
 //初始化省市行政区划信息