浏览代码

luaconfig表迁移

maxiaoshan 2 年之前
父节点
当前提交
cf280b2431
共有 7 个文件被更改,包括 28 次插入11 次删除
  1. 7 0
      src/config.json
  2. 1 1
      src/luatask/downloadnum.go
  3. 6 6
      src/luatask/task.go
  4. 1 1
      src/timetask/filewarn.go
  5. 2 2
      src/timetask/summary.go
  6. 1 1
      src/timetask/wxworkwarn.go
  7. 10 0
      src/util/config.go

+ 7 - 0
src/config.json

@@ -9,6 +9,13 @@
 		"db": "editor",
 		"size": 15
     },
+	"bideditor": {
+		"addr": "192.168.3.207:27001",
+		"db": "editor",
+		"size": 2,
+		"username": "root",
+		"password": "root"
+	},
 	"pyspider":{
 		"addr": "192.168.3.207:27092",
 		"db": "py_spider",

+ 1 - 1
src/luatask/downloadnum.go

@@ -158,7 +158,7 @@ func getAllSpider() map[string]map[string]interface{} {
 			},
 		},
 	}
-	luas, _ := util.MgoE.Find("luaconfig", query, nil, fields, false, -1, -1)
+	luas, _ := util.MgoEB.Find("luaconfig", query, nil, fields, false, -1, -1)
 	reps := map[string]map[string]interface{}{}
 	for _, lua := range *luas {
 		rep := map[string]interface{}{}

+ 6 - 6
src/luatask/task.go

@@ -210,8 +210,8 @@ func InitInfo() {
 // GetCodeBaseInfo 准备爬虫基本信息
 func GetCodeBaseInfo() {
 	defer qu.Catch()
-	sess := util.MgoE.GetMgoConn()
-	defer util.MgoE.DestoryMongoConn(sess)
+	sess := util.MgoEB.GetMgoConn()
+	defer util.MgoEB.DestoryMongoConn(sess)
 	lock := &sync.Mutex{}
 	wg := &sync.WaitGroup{}
 	ch := make(chan bool, 5)
@@ -256,9 +256,9 @@ func GetCodeBaseInfo() {
 		"frequencyerrtimes": 1,
 		"code":              1,
 	}
-	count := util.MgoE.Count("luaconfig", query)
+	count := util.MgoEB.Count("luaconfig", query)
 	logger.Debug("共加载线上爬虫个数:", count)
-	it := sess.DB(util.MgoE.DbName).C("luaconfig").Find(&query).Select(&fieles).Iter()
+	it := sess.DB(util.MgoEB.DbName).C("luaconfig").Find(&query).Select(&fieles).Iter()
 	n := 0
 	for tmp := make(map[string]interface{}); it.Next(tmp); n++ {
 		wg.Add(1)
@@ -1738,7 +1738,7 @@ func CreateTask(t *Task, sp *Spider, upsertBulk *[][]map[string]interface{}, loc
 			return
 		} else { //挂起状态有下载量,更新爬虫挂起状态
 			sp.PendState = 0 //影响任务i_pendstate状态
-			util.MgoE.Update("luaconfig", map[string]interface{}{"code": sp.Code}, map[string]interface{}{"$set": map[string]interface{}{"pendstate": 0}}, false, false)
+			util.MgoEB.Update("luaconfig", map[string]interface{}{"code": sp.Code}, map[string]interface{}{"$set": map[string]interface{}{"pendstate": 0}}, false, false)
 		}
 	}
 	diff := time.Now().Unix() - sp.AuditTime
@@ -1865,7 +1865,7 @@ func UpdateLuaInfo(sp *Spider) {
 		set["param_common.5"] = sp.MaxPage + 1
 	}
 	logger.Debug("Code:", sp.Code, "	", sp.FrequencyErrTimes)
-	b := util.MgoE.Update("luaconfig", map[string]interface{}{"code": sp.Code}, map[string]interface{}{"$set": set}, false, false)
+	b := util.MgoEB.Update("luaconfig", map[string]interface{}{"code": sp.Code}, map[string]interface{}{"$set": set}, false, false)
 	if b && sp.FrequencyErrTimes <= 3 { //FrequencyErrTimes>3时会建采集频率异常的待处理任务,不再上下架
 		//爬虫下架、上加
 		qu.Debug("爬虫上下架 code:", sp.Code)

+ 1 - 1
src/timetask/filewarn.go

@@ -61,7 +61,7 @@ func GetFileWarn() {
 			row.AddCell().SetValue(title)
 			href := qu.ObjToString(tmp["href"])
 			row.AddCell().SetValue(href)
-			lua, _ := util.MgoE.FindOne("luaconfig", map[string]interface{}{"code": code})
+			lua, _ := util.MgoEB.FindOne("luaconfig", map[string]interface{}{"code": code})
 			if len(*lua) > 0 {
 				row.AddCell().SetValue((*lua)["modifyuser"])
 				urgency := qu.IntAll((*lua)["urgency"])

+ 2 - 2
src/timetask/summary.go

@@ -102,8 +102,8 @@ func SummaryCode() {
 	sm_wg2 := &sync.WaitGroup{}
 	sm_lock2 := &sync.Mutex{}
 	arr := []map[string]interface{}{}
-	sess_e := util.MgoE.GetMgoConn()
-	defer util.MgoE.DestoryMongoConn(sess_e)
+	sess_e := util.MgoEB.GetMgoConn()
+	defer util.MgoEB.DestoryMongoConn(sess_e)
 	fe := map[string]interface{}{
 		"code":         1,
 		"event":        1,

+ 1 - 1
src/timetask/wxworkwarn.go

@@ -197,7 +197,7 @@ func SendInfoToWxWork_ToAuditor() {
 				"$ne": "ssc",
 			}
 		}
-		count := util.MgoE.Count("luaconfig", query)
+		count := util.MgoEB.Count("luaconfig", query)
 		tmpContent += userInfo.Username + "需审核的爬虫有:" + fmt.Sprint(count) + "个;"
 		tmpModifyList = append(tmpModifyList, userInfo.Mobile)
 	}

+ 10 - 0
src/util/config.go

@@ -10,6 +10,7 @@ import (
 var (
 	Config                     map[string]interface{}
 	MgoE                       *mgo.MongodbSim //editor
+	MgoEB                      *mgo.MongodbSim //editor
 	MgoS                       *mgo.MongodbSim //spider
 	MgoPy                      *mgo.MongodbSim //py_spider
 	MgoB                       *mgo.MongodbSim //bidding
@@ -65,6 +66,15 @@ func InitMgo() {
 		Password:    qu.ObjToString(bidding["password"]),
 	}
 	MgoB.InitPool()
+	bidEditor := Config["bideditor"].(map[string]interface{})
+	MgoEB = &mgo.MongodbSim{
+		MongodbAddr: qu.ObjToString(bidEditor["addr"]),
+		DbName:      qu.ObjToString(bidEditor["db"]),
+		Size:        qu.IntAll(bidEditor["size"]),
+		UserName:    qu.ObjToString(bidEditor["username"]),
+		Password:    qu.ObjToString(bidEditor["password"]),
+	}
+	MgoEB.InitPool()
 }
 
 func InitOther() {