|
@@ -88,7 +88,7 @@ func getEsData(firstTime, LastTime int64) (map[string]map[string]interface{}, in
|
|
}
|
|
}
|
|
|
|
|
|
dataMap, numDocs := map[string]map[string]interface{}{}, 0
|
|
dataMap, numDocs := map[string]map[string]interface{}{}, 0
|
|
- ctx, _ := context.WithTimeout(context.Background(), 30*time.Second)
|
|
|
|
|
|
+ ctx, _ := context.WithTimeout(context.Background(), 5*time.Minute)
|
|
esCon := elastic.VarEs.(*elastic.EsV7)
|
|
esCon := elastic.VarEs.(*elastic.EsV7)
|
|
client := esCon.GetEsConn()
|
|
client := esCon.GetEsConn()
|
|
defer esCon.DestoryEsConn(client)
|
|
defer esCon.DestoryEsConn(client)
|
|
@@ -134,7 +134,7 @@ func getEsData(firstTime, LastTime int64) (map[string]map[string]interface{}, in
|
|
client.ClearScroll().ScrollId(scrollId).Do(ctx) //清理游标
|
|
client.ClearScroll().ScrollId(scrollId).Do(ctx) //清理游标
|
|
log.Println("Result Data Count:", numDocs)
|
|
log.Println("Result Data Count:", numDocs)
|
|
} else {
|
|
} else {
|
|
- log.Println("Es Search Data Error")
|
|
|
|
|
|
+ log.Println("Es Search Data Error", err)
|
|
}
|
|
}
|
|
return dataMap, numDocs
|
|
return dataMap, numDocs
|
|
}
|
|
}
|