|
@@ -23,8 +23,7 @@ import (
|
|
|
"time"
|
|
|
)
|
|
|
|
|
|
-var
|
|
|
-(
|
|
|
+var (
|
|
|
Config = make(map[string]string)
|
|
|
Fields []string
|
|
|
SourceClient, FClient *mongo.Client
|
|
@@ -38,10 +37,11 @@ var
|
|
|
EsConn *es.Client
|
|
|
Updport int
|
|
|
)
|
|
|
+
|
|
|
/**
|
|
|
新增
|
|
|
初始化
|
|
|
- */
|
|
|
+*/
|
|
|
func init() {
|
|
|
log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
|
|
|
util.ReadConfig(&Config)
|
|
@@ -116,7 +116,7 @@ func init() {
|
|
|
return nil, err
|
|
|
}
|
|
|
return conn, nil
|
|
|
- },}
|
|
|
+ }}
|
|
|
c := RedisPool.Get()
|
|
|
if _, err := c.Do("PING"); err != nil {
|
|
|
log.Fatalln("redis err:", err)
|
|
@@ -131,7 +131,7 @@ func main() {
|
|
|
udpclient = mu.UdpClient{Local: updport, BufSize: 1024}
|
|
|
udpclient.Listen(processUdpMsg)
|
|
|
log.Println("Udp服务监听", updport)
|
|
|
- log.Println("发送端口port:",Updport)
|
|
|
+ log.Println("发送端口port:", Updport)
|
|
|
go TimedTask() //定时任务
|
|
|
c := make(chan int, 1)
|
|
|
<-c
|
|
@@ -180,7 +180,7 @@ func task(mapinfo *map[string]interface{}) {
|
|
|
"$lte": LtId,
|
|
|
},
|
|
|
}, options.Find().SetProjection(bson.M{"winner": 1, "winnertel": 1, "winnerperson": 1,
|
|
|
- "topscopeclass": 1, "winneraddr": 1}).SetSort(bson.M{"_id": 1}).SetBatchSize(60000000).SetMaxTime(time.Hour*24))
|
|
|
+ "topscopeclass": 1, "winneraddr": 1}).SetSort(bson.M{"_id": 1}))
|
|
|
if err != nil {
|
|
|
log.Println(err)
|
|
|
return
|
|
@@ -358,8 +358,8 @@ func task(mapinfo *map[string]interface{}) {
|
|
|
}
|
|
|
}
|
|
|
defer cursor.Close(c2)
|
|
|
- log.Println("合并执行完成", gtid, lteid ,overid)
|
|
|
- if gtid != lteid{
|
|
|
+ log.Println("合并执行完成", gtid, lteid, overid)
|
|
|
+ if overid != lteid {
|
|
|
by, _ := json.Marshal(map[string]interface{}{
|
|
|
"gtid": overid,
|
|
|
"lteid": lteid,
|
|
@@ -368,11 +368,11 @@ func task(mapinfo *map[string]interface{}) {
|
|
|
if e := udpclient.WriteUdp(by, mu.OP_TYPE_DATA, &net.UDPAddr{
|
|
|
IP: net.ParseIP("127.0.0.1"),
|
|
|
Port: Updport,
|
|
|
- });e != nil{
|
|
|
+ }); e != nil {
|
|
|
log.Println(e)
|
|
|
}
|
|
|
- log.Println("重新发送udp:",string(by))
|
|
|
+ log.Println("重新发送udp:", string(by))
|
|
|
}
|
|
|
- log.Println("合并执行完成 ok", gtid, lteid,overid)
|
|
|
+ log.Println("合并执行完成 ok", gtid, lteid, overid)
|
|
|
|
|
|
}
|