|
@@ -46,7 +46,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
|
|
|
}).Select(bson.M{"winner": 1, "winnertel": 1, "winnerperson": 1, "topscopeclass": 1, "winneraddr": 1}).Iter()
|
|
|
|
|
|
if cursor.Err() != nil {
|
|
|
- SourceClientcc.Close()
|
|
|
+ SourceClient.DestoryMongoConn(SourceClientcc)
|
|
|
log.Println(cursor.Err())
|
|
|
return
|
|
|
}
|
|
@@ -86,7 +86,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
|
|
|
log.Println(err)
|
|
|
}
|
|
|
}
|
|
|
- SourceClientcc.Close()
|
|
|
+ SourceClient.DestoryMongoConn(SourceClientcc)
|
|
|
//遍历redis
|
|
|
if scan := conn.Scan(0, "", 100); scan.Err() != nil {
|
|
|
log.Println(scan.Err())
|
|
@@ -110,7 +110,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
|
|
|
for _, vmap := range rValuesMaps {
|
|
|
vmap["_id"] = bson.ObjectIdHex(vmap["_id"].(string))
|
|
|
if err = FClient.SaveForOld("winner_new", vmap); err != nil {
|
|
|
- log.Println("存量 FClient.Save err", err,vmap)
|
|
|
+ log.Println("存量 FClient.Save err", err, vmap)
|
|
|
}
|
|
|
}
|
|
|
//log.Println("get redis id err:定时任务处理", err, tmp)
|
|
@@ -231,8 +231,8 @@ func TaskWinner(mapinfo *map[string]interface{}) {
|
|
|
if reply, err := redis.String(rdb.Do("GET", tmp["winner"])); err != nil {
|
|
|
//redis不存在存到临时表,定时任务处理
|
|
|
FClient.DbName = Config["mgodb_extract_kf"]
|
|
|
- if err := FClient.SaveForOld("winner_new", tmp); err!=nil {
|
|
|
- log.Println("FClient.Save err", err,tmp)
|
|
|
+ if err := FClient.SaveForOld("winner_new", tmp); err != nil {
|
|
|
+ log.Println("FClient.Save err", err, tmp)
|
|
|
}
|
|
|
//log.Println("get redis id err:定时任务处理", err, tmp)
|
|
|
if err := rdb.Close(); err != nil {
|
|
@@ -338,6 +338,7 @@ func TaskWinner(mapinfo *map[string]interface{}) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ SourceClient.DestoryMongoConn(SourceClientcc)
|
|
|
log.Println("增量合并执行完成 ok", gtid, lteid, overid)
|
|
|
}
|
|
|
|
|
@@ -351,13 +352,13 @@ func TimedTaskWinner() {
|
|
|
t2 := time.NewTimer(time.Second * 5)
|
|
|
for range t2.C {
|
|
|
Fcconn := FClient.GetMgoConn(86400)
|
|
|
- defer Fcconn.Close()
|
|
|
tmpLast := map[string]interface{}{}
|
|
|
if iter := Fcconn.DB(Config["mgodb_extract_kf"]).C("winner_new").Find(bson.M{}).Sort("-_id").Limit(1).Iter(); iter != nil {
|
|
|
if !iter.Next(&tmpLast) {
|
|
|
//临时表无数据
|
|
|
log.Println("临时表无数据:")
|
|
|
- t2.Reset(time.Minute * 1)
|
|
|
+ t2.Reset(time.Minute * 5)
|
|
|
+ FClient.DestoryMongoConn(Fcconn)
|
|
|
continue
|
|
|
} else {
|
|
|
log.Println("临时表有数据:", tmpLast)
|
|
@@ -370,6 +371,7 @@ func TimedTaskWinner() {
|
|
|
if cursor == nil {
|
|
|
log.Println("查询失败")
|
|
|
t2.Reset(time.Second * 5)
|
|
|
+ FClient.DestoryMongoConn(fconn)
|
|
|
continue
|
|
|
}
|
|
|
//遍历临时表数据,匹配不到原始库存入异常表
|
|
@@ -631,9 +633,10 @@ func TimedTaskWinner() {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- fconn.Close()
|
|
|
+ FClient.DestoryMongoConn(fconn)
|
|
|
}
|
|
|
}
|
|
|
+ FClient.DestoryMongoConn(Fcconn)
|
|
|
t2.Reset(time.Minute)
|
|
|
}
|
|
|
}
|