floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed setup conflicts

This commit is contained in:
liugq 2022-10-25 17:36:01 +08:00
parent 0922db5024
commit 362129d9f2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/setup/setup.go
View File

@ -250,17 +250,15 @@ func (module *Module) initTempClient(r *http.Request) (error, elastic.API,SetupR
cfg.ID = tempID cfg.ID = tempID
cfg.Name = "INFINI_SYSTEM ("+util.PickRandomName()+")" cfg.Name = "INFINI_SYSTEM ("+util.PickRandomName()+")"
elastic.InitMetadata(&cfg, true)
client, err := elastic1.InitClientWithConfig(cfg) client, err := elastic1.InitClientWithConfig(cfg)
if err != nil { if err != nil {
return err,nil,request return err,nil,request
} }
cfg.Version=client.GetVersion()
meta:=elastic.InitMetadata(&cfg, true)
meta.Config.Version=cfg.Version
elastic.SetMetadata(tempID,meta)
elastic.UpdateConfig(cfg) elastic.UpdateConfig(cfg)
elastic.UpdateClient(cfg, client) elastic.UpdateClient(cfg, client)
cfg.Version=client.GetVersion()
global.Register(elastic.GlobalSystemElasticsearchID,tempID) global.Register(elastic.GlobalSystemElasticsearchID,tempID)
return err, client,request return err, client,request