|
@@ -93,8 +93,8 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
|
|
|
log.Debug(string(data))
|
|
|
log2.Println(string(data))
|
|
|
case mu.OP_SEND_EMAIL:
|
|
|
- log.Debug("实例抽取完成,发送邮件:",string(data),ra.IP)
|
|
|
- log2.Println("实例抽取完成,发送邮件:",string(data), ra.IP)
|
|
|
+ log.Debug("实例抽取完成,发送邮件:", string(data), ra.IP)
|
|
|
+ log2.Println("实例抽取完成,发送邮件:", string(data), ra.IP)
|
|
|
rep := make(map[string]interface{})
|
|
|
err := json.Unmarshal(data, &rep)
|
|
|
if err != nil {
|
|
@@ -102,33 +102,33 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
|
|
|
log2.Println(string(data), ra.IP)
|
|
|
} else {
|
|
|
tmpstr := ""
|
|
|
- for k,v :=range rep{
|
|
|
+ for k, v := range rep {
|
|
|
switch k {
|
|
|
case "desc":
|
|
|
- tmpstr += fmt.Sprint(v)+","
|
|
|
+ tmpstr += fmt.Sprint(v) + ","
|
|
|
case "count":
|
|
|
- tmpstr += "区间数据量为"+fmt.Sprint(v)+","
|
|
|
+ tmpstr += "实际抽取数据量" + fmt.Sprint(v) + ","
|
|
|
case "index":
|
|
|
- tmpstr += "实际抽取数据量"+fmt.Sprint(v)+","
|
|
|
+ tmpstr += "区间数据量为" + fmt.Sprint(v) + ","
|
|
|
case "instanceId":
|
|
|
- tmpstr += "实例"+fmt.Sprint(v)+","
|
|
|
+ tmpstr += "实例" + fmt.Sprint(v) + ","
|
|
|
}
|
|
|
}
|
|
|
- tmpstr = strings.TrimRight(tmpstr,",")
|
|
|
+ tmpstr = strings.TrimRight(tmpstr, ",")
|
|
|
sendMail(tmpstr)
|
|
|
cluster.ModifyInstanceAutoReleaseTime(qu.ObjToString(rep["instanceId"]), qu.IntAll(ju.Config["deleteInstanceTimeHour"]))
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
func sendMail(content string) {
|
|
|
- log2.Println(ju.Config["api"], ju.Config["tomail"],"jy-data-extract_3.2","抽取完成:"+content)
|
|
|
+ log2.Println(ju.Config["api"], ju.Config["tomail"], "jy-data-extract_3.2", "抽取完成:"+content)
|
|
|
res, err := http.Get(fmt.Sprintf("%s?to=%s&title=%s&body=%s", ju.Config["api"], ju.Config["tomail"], "jy-data-extract_3.2", "抽取完成:"+content))
|
|
|
defer res.Body.Close()
|
|
|
if err == nil {
|
|
|
read, err := ioutil.ReadAll(res.Body)
|
|
|
log2.Println("邮件发送:", string(read), err)
|
|
|
}
|
|
|
- log2.Println("api email:",err)
|
|
|
+ log2.Println("api email:", err)
|
|
|
}
|
|
|
|
|
|
var ext *ExtractTask
|
|
@@ -192,7 +192,7 @@ func ExtractByUdp(sid, eid string, ra *net.UDPAddr, instanceId ...string) {
|
|
|
if qu.ObjToString((*esc)["lastIdback"]) != "" {
|
|
|
sidback = qu.ObjToString((*esc)["lastIdback"])
|
|
|
}
|
|
|
- go Udpclient.WriteUdp([]byte(fmt.Sprintf("IP=%s,数据接收成功,count=%d,pageNum=%d,query=%v\n",instanceId[1], count, pageNum, query)), mu.OP_NOOP, ra)
|
|
|
+ go Udpclient.WriteUdp([]byte(fmt.Sprintf("IP=%s,数据接收成功,count=%d,pageNum=%d,query=%v\n", instanceId[1], count, pageNum, query)), mu.OP_NOOP, ra)
|
|
|
for i := startI; i < pageNum; i++ {
|
|
|
query = bson.M{"_id": bson.M{"$gte": bson.ObjectIdHex(sid), "$lte": bson.ObjectIdHex(eid)}}
|
|
|
fmt.Printf("page=%d,query=%v\n", i+1, query)
|
|
@@ -253,7 +253,7 @@ func ExtractByUdp(sid, eid string, ra *net.UDPAddr, instanceId ...string) {
|
|
|
}}, true, false)
|
|
|
}
|
|
|
des := make(map[string]interface{})
|
|
|
- des["desc"]="分布式抽取完成,一小时后释放"
|
|
|
+ des["desc"] = "分布式抽取完成,一小时后释放"
|
|
|
des["count"] = count
|
|
|
des["index"] = index
|
|
|
des["instanceId"] = instanceId[0]
|