Merge branch 'openimsdk:main' into main

withchao · Dec 27, 2024 · df063d2 · df063d2
2 parents 9f1fff6 + 930a9fd
commit df063d2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/internal/api/router.go b/internal/api/router.go
@@ -314,7 +314,7 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 		configGroup.POST("/reset_config", cm.ResetConfig)
 	}
 	{
-		r.POST("/restart", cm.Restart)
+		r.POST("/restart", cm.CheckAdmin, cm.Restart)
 	}
 	return r, nil
 }

diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go
@@ -143,9 +143,22 @@ func (r *RootCmd) updateConfigFromEtcd(opts *CmdOpts) error {
 	}
 
 	update := func(configFileName string, configStruct any) error {
+		ctx := context.TODO()
 		key := disetcd.BuildKey(configFileName)
-		etcdRes, err := r.etcdClient.Get(context.TODO(), key)
-		if err != nil || etcdRes.Count == 0 {
+		etcdRes, err := r.etcdClient.Get(ctx, key)
+		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
 		}
 		err = json.Unmarshal(etcdRes.Kvs[0].Value, configStruct)