From 3f482d623030d8a01201fc77eda486f8edb59b8e Mon Sep 17 00:00:00 2001 From: icey-yu <1186114839@qq.com> Date: Tue, 24 Dec 2024 14:32:27 +0800 Subject: [PATCH] feat: config --- internal/api/config_manager.go | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/internal/api/config_manager.go b/internal/api/config_manager.go index 7b8c2cdb0..16a2786c8 100644 --- a/internal/api/config_manager.go +++ b/internal/api/config_manager.go @@ -12,6 +12,7 @@ import ( "github.com/openimsdk/open-im-server/v3/version" "github.com/openimsdk/tools/apiresp" "github.com/openimsdk/tools/errs" + "github.com/openimsdk/tools/log" "github.com/openimsdk/tools/utils/runtimeenv" clientv3 "go.etcd.io/etcd/client/v3" ) @@ -196,11 +197,16 @@ func (cm *ConfigManager) restart(c *gin.Context) { changedKeys := make([]string, 0, len(configMap)) for k, v := range configMap { - err := config.Load(cm.configPath, k, config.EnvPrefixMap[k], - cm.runtimeEnv, v.new) + err := config.Load( + cm.configPath, + k, + config.EnvPrefixMap[k], + cm.runtimeEnv, + v.new, + ) if err != nil { - apiresp.GinError(c, errs.WrapMsg(err, "load config failed")) - return + log.ZError(c, "load config failed", err) + continue } v.isChanged = reflect.DeepEqual(v.old, v.new) if v.isChanged { @@ -211,13 +217,13 @@ func (cm *ConfigManager) restart(c *gin.Context) { for _, k := range changedKeys { data, err := json.Marshal(configMap[k].new) if err != nil { - apiresp.GinError(c, errs.WrapMsg(err, "marshal config failed")) - return + log.ZError(c, "marshal config failed", err) + continue } _, err = cm.client.Put(c, etcd.BuildKey(k), string(data)) if err != nil { - apiresp.GinError(c, errs.WrapMsg(err, "save to etcd failed")) - return + log.ZError(c, "save to etcd failed", err) + continue } } etcd.CanRestart <- struct{}{}