blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: The system cannot be restarted the first time the configuration is set. (#3013)

Browse Source
This commit is contained in:
icey-yu 2024-12-27 16:23:26 +08:00 committed by GitHub
parent 1af31847fa
commit 930a9fd7d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/common/cmd/root.go
View File

@ -143,9 +143,22 @@ func (r *RootCmd) updateConfigFromEtcd(opts *CmdOpts) error {
} }
update := func(configFileName string, configStruct any) error { update := func(configFileName string, configStruct any) error {
ctx := context.TODO()
key := disetcd.BuildKey(configFileName) key := disetcd.BuildKey(configFileName)
etcdRes, err := r.etcdClient.Get(context.TODO(), key) etcdRes, err := r.etcdClient.Get(ctx, key)
if err != nil || etcdRes.Count == 0 { if err != nil {
log.ZWarn(ctx, "root cmd updateConfigFromEtcd, etcd Get err: %v", errs.Wrap(err))
return nil
}
if etcdRes.Count == 0 {
data, err := json.Marshal(configStruct)
if err != nil {
return errs.ErrArgs.WithDetail(err.Error()).Wrap()
}
_, err = r.etcdClient.Put(ctx, disetcd.BuildKey(configFileName), string(data))
if err != nil {
log.ZWarn(ctx, "root cmd updateConfigFromEtcd, etcd Put err: %v", errs.Wrap(err))
}
return nil return nil
} }
err = json.Unmarshal(etcdRes.Kvs[0].Value, configStruct) err = json.Unmarshal(etcdRes.Kvs[0].Value, configStruct)