|
@@ -443,6 +443,7 @@ func SaveEsMethod() {
|
|
oid := util.ObjToString(v["old_preferid"])
|
|
oid := util.ObjToString(v["old_preferid"])
|
|
delete(v, "old_preferid")
|
|
delete(v, "old_preferid")
|
|
if oid != "" {
|
|
if oid != "" {
|
|
|
|
+ log.Info("SaveEsMethod,9008 bidding 删除 之前的优选id ", zap.Any("id", oid), zap.Any("time", time.Now().Unix()))
|
|
err := Es.DeleteByID(config.Conf.DB.Es.IndexB, oid)
|
|
err := Es.DeleteByID(config.Conf.DB.Es.IndexB, oid)
|
|
if err != nil {
|
|
if err != nil {
|
|
log.Info("SaveEsMethod", zap.String("上次优选ID删除失败", oid))
|
|
log.Info("SaveEsMethod", zap.String("上次优选ID删除失败", oid))
|
|
@@ -463,8 +464,6 @@ func SaveEsMethod() {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- log.Info("SaveEsMethod,保存bidding数据到es;单携程保存", zap.Any("pici", v["pici"]), zap.Any("id", v["id"]), zap.Any("time", time.Now().Unix()))
|
|
|
|
-
|
|
|
|
if len(mgoUpdate) > 0 {
|
|
if len(mgoUpdate) > 0 {
|
|
updateBiddingPool <- map[string]interface{}{
|
|
updateBiddingPool <- map[string]interface{}{
|
|
"_id": mongodb.StringTOBsonId(util.ObjToString(v["_id"])),
|
|
"_id": mongodb.StringTOBsonId(util.ObjToString(v["_id"])),
|
|
@@ -476,28 +475,46 @@ func SaveEsMethod() {
|
|
go UdpMethod(mongodb.BsonIdToSId(v["_id"]))
|
|
go UdpMethod(mongodb.BsonIdToSId(v["_id"]))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
- Es.Save(config.Conf.DB.Es.IndexB, v)
|
|
|
|
|
|
+ log.Info("SaveEsMethod,9008 保存bidding数据到es;单携程保存", zap.Any("pici", v["pici"]), zap.Any("id", v["id"]), zap.Any("time", time.Now().Unix()))
|
|
|
|
+ delete(v, "_id")
|
|
|
|
+ err := Es.SaveDocument(config.Conf.DB.Es.IndexB, v)
|
|
|
|
+ if err != nil {
|
|
|
|
+ log.Error("SaveEsMethod,9008 保存bidding数据到es;保存失败", zap.Error(err), zap.Any("id", id))
|
|
|
|
+ }
|
|
|
|
|
|
// 华为云集群1
|
|
// 华为云集群1
|
|
if config.Conf.DB.Es.Addr2 != "" {
|
|
if config.Conf.DB.Es.Addr2 != "" {
|
|
v["id"] = id
|
|
v["id"] = id
|
|
- v["_id"] = ids
|
|
|
|
|
|
+ //v["_id"] = ids
|
|
delete(v, "old_preferid")
|
|
delete(v, "old_preferid")
|
|
if oid != "" {
|
|
if oid != "" {
|
|
|
|
+ log.Info("SaveEsMethod,9005 bidding 删除 之前的优选id ", zap.Any("id", oid), zap.Any("time", time.Now().Unix()))
|
|
err := Es2.DeleteByID(config.Conf.DB.Es.IndexB, oid)
|
|
err := Es2.DeleteByID(config.Conf.DB.Es.IndexB, oid)
|
|
|
|
+ if err != nil {
|
|
|
|
+ log.Error("SaveEsMethod 9005 bidding", zap.String("上次优选ID删除失败", oid))
|
|
|
|
+ }
|
|
|
|
+ log.Info("SaveEsMethod,9005 bidding_temp 删除 之前的优选id ", zap.Any("id", oid), zap.Any("time", time.Now().Unix()))
|
|
err = Es2.DeleteByID(config.Conf.DB.Es.IndexTmp, oid)
|
|
err = Es2.DeleteByID(config.Conf.DB.Es.IndexTmp, oid)
|
|
if err != nil {
|
|
if err != nil {
|
|
- log.Info("SaveEsMethod", zap.String("上次优选ID删除失败", oid))
|
|
|
|
|
|
+ log.Error("SaveEsMethod 9005 bidding_temp", zap.String("上次优选ID删除失败", oid))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- Es2.Save(config.Conf.DB.Es.Indexb2, v)
|
|
|
|
|
|
+ log.Info("SaveEsMethod,9005 保存bidding数据到es;单携程保存", zap.Any("pici", v["pici"]), zap.Any("id", v["id"]), zap.Any("time", time.Now().Unix()))
|
|
|
|
+ err := Es2.SaveDocument(config.Conf.DB.Es.Indexb2, v)
|
|
|
|
+ if err != nil {
|
|
|
|
+ log.Error("SaveEsMethod,9005 保存bidding数据到es;保存失败", zap.Error(err), zap.Any("id", id))
|
|
|
|
+ }
|
|
|
|
+
|
|
// bidding_temporary,只需要存放 19905 这个集群
|
|
// bidding_temporary,只需要存放 19905 这个集群
|
|
if config.Conf.DB.Es.IndexTmp != "" {
|
|
if config.Conf.DB.Es.IndexTmp != "" {
|
|
v["id"] = id
|
|
v["id"] = id
|
|
- v["_id"] = ids
|
|
|
|
|
|
+ //v["_id"] = ids
|
|
delete(v, "old_preferid")
|
|
delete(v, "old_preferid")
|
|
- Es2.Save(config.Conf.DB.Es.IndexTmp, v)
|
|
|
|
|
|
+ log.Info("SaveEsMethod,9005 保存bidding_temp 数据到es;单携程保存", zap.Any("pici", v["pici"]), zap.Any("id", v["id"]), zap.Any("time", time.Now().Unix()))
|
|
|
|
+ err = Es2.SaveDocument(config.Conf.DB.Es.IndexTmp, v)
|
|
|
|
+ if err != nil {
|
|
|
|
+ log.Error("SaveEsMethod,9005 保存bidding_temp数据到es;保存失败", zap.Error(err), zap.Any("id", id))
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 华为云新集群2,迁移原来阿里云数据
|
|
// 华为云新集群2,迁移原来阿里云数据
|