feat: Add enable config center button && fix: grpc connection leakage (#3036)
* feat: add enable config center * fix: config * fix: config * fix: config * fix: configpull/3118/head
icey-yu
9 months ago
committed by
OpenIM-Robot
parent
5c192d05ee
commit
3e12bf3d49
@ -1,313 +1,308 @@
|
|||||||
package api
|
package api
|
||||||
|
|
||||||
//
|
import (
|
||||||
//import (
|
"encoding/json"
|
||||||
// "encoding/json"
|
"reflect"
|
||||||
// "reflect"
|
"strconv"
|
||||||
// "strconv"
|
"time"
|
||||||
// "time"
|
|
||||||
//
|
"github.com/gin-gonic/gin"
|
||||||
// "github.com/gin-gonic/gin"
|
"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
|
||||||
// "github.com/openimsdk/open-im-server/v3/pkg/apistruct"
|
"github.com/openimsdk/open-im-server/v3/pkg/authverify"
|
||||||
// "github.com/openimsdk/open-im-server/v3/pkg/authverify"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
||||||
// "github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
|
||||||
// "github.com/openimsdk/open-im-server/v3/pkg/common/discovery/etcd"
|
"github.com/openimsdk/open-im-server/v3/version"
|
||||||
// "github.com/openimsdk/open-im-server/v3/version"
|
"github.com/openimsdk/tools/apiresp"
|
||||||
// "github.com/openimsdk/tools/apiresp"
|
"github.com/openimsdk/tools/errs"
|
||||||
// "github.com/openimsdk/tools/errs"
|
"github.com/openimsdk/tools/log"
|
||||||
// "github.com/openimsdk/tools/log"
|
"github.com/openimsdk/tools/utils/runtimeenv"
|
||||||
// "github.com/openimsdk/tools/utils/runtimeenv"
|
clientv3 "go.etcd.io/etcd/client/v3"
|
||||||
// clientv3 "go.etcd.io/etcd/client/v3"
|
)
|
||||||
//)
|
|
||||||
//
|
const (
|
||||||
//const (
|
// wait for Restart http call return
|
||||||
// // wait for Restart http call return
|
waitHttp = time.Millisecond * 200
|
||||||
// waitHttp = time.Millisecond * 200
|
)
|
||||||
//)
|
|
||||||
//
|
type ConfigManager struct {
|
||||||
//type ConfigManager struct {
|
imAdminUserID []string
|
||||||
// imAdminUserID []string
|
config *config.AllConfig
|
||||||
// config *config.AllConfig
|
client *clientv3.Client
|
||||||
// client *clientv3.Client
|
|
||||||
//
|
configPath string
|
||||||
// configPath string
|
runtimeEnv string
|
||||||
// runtimeEnv string
|
}
|
||||||
//}
|
|
||||||
//
|
func NewConfigManager(IMAdminUserID []string, cfg *config.AllConfig, client *clientv3.Client, configPath string, runtimeEnv string) *ConfigManager {
|
||||||
//func NewConfigManager(IMAdminUserID []string, cfg *config.AllConfig, client *clientv3.Client, configPath string, runtimeEnv string) *ConfigManager {
|
cm := &ConfigManager{
|
||||||
// cm := &ConfigManager{
|
imAdminUserID: IMAdminUserID,
|
||||||
// imAdminUserID: IMAdminUserID,
|
config: cfg,
|
||||||
// config: cfg,
|
client: client,
|
||||||
// client: client,
|
configPath: configPath,
|
||||||
// configPath: configPath,
|
runtimeEnv: runtimeEnv,
|
||||||
// runtimeEnv: runtimeEnv,
|
}
|
||||||
// }
|
return cm
|
||||||
// return cm
|
}
|
||||||
//}
|
|
||||||
//
|
func (cm *ConfigManager) CheckAdmin(c *gin.Context) {
|
||||||
//func (cm *ConfigManager) CheckAdmin(c *gin.Context) {
|
if err := authverify.CheckAdmin(c, cm.imAdminUserID); err != nil {
|
||||||
// if err := authverify.CheckAdmin(c, cm.imAdminUserID); err != nil {
|
apiresp.GinError(c, err)
|
||||||
// apiresp.GinError(c, err)
|
c.Abort()
|
||||||
// c.Abort()
|
}
|
||||||
// }
|
}
|
||||||
//}
|
|
||||||
//
|
func (cm *ConfigManager) GetConfig(c *gin.Context) {
|
||||||
//func (cm *ConfigManager) GetConfig(c *gin.Context) {
|
var req apistruct.GetConfigReq
|
||||||
// var req apistruct.GetConfigReq
|
if err := c.BindJSON(&req); err != nil {
|
||||||
// if err := c.BindJSON(&req); err != nil {
|
apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
||||||
// apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
return
|
||||||
// return
|
}
|
||||||
// }
|
conf := cm.config.Name2Config(req.ConfigName)
|
||||||
// conf := cm.config.Name2Config(req.ConfigName)
|
if conf == nil {
|
||||||
// if conf == nil {
|
apiresp.GinError(c, errs.ErrArgs.WithDetail("config name not found").Wrap())
|
||||||
// apiresp.GinError(c, errs.ErrArgs.WithDetail("config name not found").Wrap())
|
return
|
||||||
// return
|
}
|
||||||
// }
|
b, err := json.Marshal(conf)
|
||||||
// b, err := json.Marshal(conf)
|
if err != nil {
|
||||||
// if err != nil {
|
apiresp.GinError(c, err)
|
||||||
// apiresp.GinError(c, err)
|
return
|
||||||
// return
|
}
|
||||||
// }
|
apiresp.GinSuccess(c, string(b))
|
||||||
// apiresp.GinSuccess(c, string(b))
|
}
|
||||||
//}
|
|
||||||
//
|
func (cm *ConfigManager) GetConfigList(c *gin.Context) {
|
||||||
//func (cm *ConfigManager) GetConfigList(c *gin.Context) {
|
var resp apistruct.GetConfigListResp
|
||||||
// var resp apistruct.GetConfigListResp
|
resp.ConfigNames = cm.config.GetConfigNames()
|
||||||
// resp.ConfigNames = cm.config.GetConfigNames()
|
resp.Environment = runtimeenv.PrintRuntimeEnvironment()
|
||||||
// resp.Environment = runtimeenv.PrintRuntimeEnvironment()
|
resp.Version = version.Version
|
||||||
// resp.Version = version.Version
|
|
||||||
//
|
apiresp.GinSuccess(c, resp)
|
||||||
// apiresp.GinSuccess(c, resp)
|
}
|
||||||
//}
|
|
||||||
//
|
func (cm *ConfigManager) SetConfig(c *gin.Context) {
|
||||||
//func (cm *ConfigManager) SetConfig(c *gin.Context) {
|
if cm.config.Discovery.Enable != config.ETCD {
|
||||||
// if cm.config.Discovery.Enable != config.ETCD {
|
apiresp.GinError(c, errs.New("only etcd support set config").Wrap())
|
||||||
// apiresp.GinError(c, errs.New("only etcd support set config").Wrap())
|
return
|
||||||
// return
|
}
|
||||||
// }
|
var req apistruct.SetConfigReq
|
||||||
// var req apistruct.SetConfigReq
|
if err := c.BindJSON(&req); err != nil {
|
||||||
// if err := c.BindJSON(&req); err != nil {
|
apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
||||||
// apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
return
|
||||||
// return
|
}
|
||||||
// }
|
var err error
|
||||||
// var err error
|
switch req.ConfigName {
|
||||||
// switch req.ConfigName {
|
case cm.config.Discovery.GetConfigFileName():
|
||||||
// case cm.config.Discovery.GetConfigFileName():
|
err = compareAndSave[config.Discovery](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Discovery](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Kafka.GetConfigFileName():
|
||||||
// case cm.config.Kafka.GetConfigFileName():
|
err = compareAndSave[config.Kafka](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Kafka](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.LocalCache.GetConfigFileName():
|
||||||
// case cm.config.LocalCache.GetConfigFileName():
|
err = compareAndSave[config.LocalCache](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.LocalCache](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Log.GetConfigFileName():
|
||||||
// case cm.config.Log.GetConfigFileName():
|
err = compareAndSave[config.Log](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Log](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Minio.GetConfigFileName():
|
||||||
// case cm.config.Minio.GetConfigFileName():
|
err = compareAndSave[config.Minio](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Minio](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Mongo.GetConfigFileName():
|
||||||
// case cm.config.Mongo.GetConfigFileName():
|
err = compareAndSave[config.Mongo](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Mongo](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Notification.GetConfigFileName():
|
||||||
// case cm.config.Notification.GetConfigFileName():
|
err = compareAndSave[config.Notification](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Notification](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.API.GetConfigFileName():
|
||||||
// case cm.config.API.GetConfigFileName():
|
err = compareAndSave[config.API](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.API](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.CronTask.GetConfigFileName():
|
||||||
// case cm.config.CronTask.GetConfigFileName():
|
err = compareAndSave[config.CronTask](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.CronTask](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.MsgGateway.GetConfigFileName():
|
||||||
// case cm.config.MsgGateway.GetConfigFileName():
|
err = compareAndSave[config.MsgGateway](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.MsgGateway](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.MsgTransfer.GetConfigFileName():
|
||||||
// case cm.config.MsgTransfer.GetConfigFileName():
|
err = compareAndSave[config.MsgTransfer](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.MsgTransfer](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Push.GetConfigFileName():
|
||||||
// case cm.config.Push.GetConfigFileName():
|
err = compareAndSave[config.Push](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Push](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Auth.GetConfigFileName():
|
||||||
// case cm.config.Auth.GetConfigFileName():
|
err = compareAndSave[config.Auth](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Auth](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Conversation.GetConfigFileName():
|
||||||
// case cm.config.Conversation.GetConfigFileName():
|
err = compareAndSave[config.Conversation](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Conversation](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Friend.GetConfigFileName():
|
||||||
// case cm.config.Friend.GetConfigFileName():
|
err = compareAndSave[config.Friend](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Friend](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Group.GetConfigFileName():
|
||||||
// case cm.config.Group.GetConfigFileName():
|
err = compareAndSave[config.Group](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Group](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Msg.GetConfigFileName():
|
||||||
// case cm.config.Msg.GetConfigFileName():
|
err = compareAndSave[config.Msg](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Msg](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Third.GetConfigFileName():
|
||||||
// case cm.config.Third.GetConfigFileName():
|
err = compareAndSave[config.Third](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Third](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.User.GetConfigFileName():
|
||||||
// case cm.config.User.GetConfigFileName():
|
err = compareAndSave[config.User](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.User](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Redis.GetConfigFileName():
|
||||||
// case cm.config.Redis.GetConfigFileName():
|
err = compareAndSave[config.Redis](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Redis](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Share.GetConfigFileName():
|
||||||
// case cm.config.Share.GetConfigFileName():
|
err = compareAndSave[config.Share](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Share](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
case cm.config.Webhooks.GetConfigFileName():
|
||||||
// case cm.config.Webhooks.GetConfigFileName():
|
err = compareAndSave[config.Webhooks](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
||||||
// err = compareAndSave[config.Webhooks](c, cm.config.Name2Config(req.ConfigName), &req, cm)
|
default:
|
||||||
// default:
|
apiresp.GinError(c, errs.ErrArgs.Wrap())
|
||||||
// apiresp.GinError(c, errs.ErrArgs.Wrap())
|
return
|
||||||
// return
|
}
|
||||||
// }
|
if err != nil {
|
||||||
// if err != nil {
|
apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
||||||
// apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
return
|
||||||
// return
|
}
|
||||||
// }
|
apiresp.GinSuccess(c, nil)
|
||||||
// apiresp.GinSuccess(c, nil)
|
}
|
||||||
//}
|
|
||||||
//
|
func compareAndSave[T any](c *gin.Context, old any, req *apistruct.SetConfigReq, cm *ConfigManager) error {
|
||||||
//func compareAndSave[T any](c *gin.Context, old any, req *apistruct.SetConfigReq, cm *ConfigManager) error {
|
conf := new(T)
|
||||||
// conf := new(T)
|
err := json.Unmarshal([]byte(req.Data), &conf)
|
||||||
// err := json.Unmarshal([]byte(req.Data), &conf)
|
if err != nil {
|
||||||
// if err != nil {
|
return errs.ErrArgs.WithDetail(err.Error()).Wrap()
|
||||||
// return errs.ErrArgs.WithDetail(err.Error()).Wrap()
|
}
|
||||||
// }
|
eq := reflect.DeepEqual(old, conf)
|
||||||
// eq := reflect.DeepEqual(old, conf)
|
if eq {
|
||||||
// if eq {
|
return nil
|
||||||
// return nil
|
}
|
||||||
// }
|
data, err := json.Marshal(conf)
|
||||||
// data, err := json.Marshal(conf)
|
if err != nil {
|
||||||
// if err != nil {
|
return errs.ErrArgs.WithDetail(err.Error()).Wrap()
|
||||||
// return errs.ErrArgs.WithDetail(err.Error()).Wrap()
|
}
|
||||||
// }
|
_, err = cm.client.Put(c, etcd.BuildKey(req.ConfigName), string(data))
|
||||||
// _, err = cm.client.Put(c, etcd.BuildKey(req.ConfigName), string(data))
|
if err != nil {
|
||||||
// if err != nil {
|
return errs.WrapMsg(err, "save to etcd failed")
|
||||||
// return errs.WrapMsg(err, "save to etcd failed")
|
}
|
||||||
// }
|
return nil
|
||||||
// return nil
|
}
|
||||||
//}
|
|
||||||
//
|
func (cm *ConfigManager) ResetConfig(c *gin.Context) {
|
||||||
//func (cm *ConfigManager) ResetConfig(c *gin.Context) {
|
go func() {
|
||||||
// go func() {
|
if err := cm.resetConfig(c, true); err != nil {
|
||||||
// if err := cm.resetConfig(c, true); err != nil {
|
log.ZError(c, "reset config err", err)
|
||||||
// log.ZError(c, "reset config err", err)
|
}
|
||||||
// }
|
}()
|
||||||
// }()
|
apiresp.GinSuccess(c, nil)
|
||||||
// apiresp.GinSuccess(c, nil)
|
}
|
||||||
//}
|
|
||||||
//
|
func (cm *ConfigManager) resetConfig(c *gin.Context, checkChange bool, ops ...clientv3.Op) error {
|
||||||
//func (cm *ConfigManager) resetConfig(c *gin.Context, checkChange bool, ops ...clientv3.Op) error {
|
txn := cm.client.Txn(c)
|
||||||
// txn := cm.client.Txn(c)
|
type initConf struct {
|
||||||
// type initConf struct {
|
old any
|
||||||
// old any
|
new any
|
||||||
// new any
|
}
|
||||||
// }
|
configMap := map[string]*initConf{
|
||||||
// configMap := map[string]*initConf{
|
cm.config.Discovery.GetConfigFileName(): {old: &cm.config.Discovery, new: new(config.Discovery)},
|
||||||
// cm.config.Discovery.GetConfigFileName(): {old: &cm.config.Discovery, new: new(config.Discovery)},
|
cm.config.Kafka.GetConfigFileName(): {old: &cm.config.Kafka, new: new(config.Kafka)},
|
||||||
// cm.config.Kafka.GetConfigFileName(): {old: &cm.config.Kafka, new: new(config.Kafka)},
|
cm.config.LocalCache.GetConfigFileName(): {old: &cm.config.LocalCache, new: new(config.LocalCache)},
|
||||||
// cm.config.LocalCache.GetConfigFileName(): {old: &cm.config.LocalCache, new: new(config.LocalCache)},
|
cm.config.Log.GetConfigFileName(): {old: &cm.config.Log, new: new(config.Log)},
|
||||||
// cm.config.Log.GetConfigFileName(): {old: &cm.config.Log, new: new(config.Log)},
|
cm.config.Minio.GetConfigFileName(): {old: &cm.config.Minio, new: new(config.Minio)},
|
||||||
// cm.config.Minio.GetConfigFileName(): {old: &cm.config.Minio, new: new(config.Minio)},
|
cm.config.Mongo.GetConfigFileName(): {old: &cm.config.Mongo, new: new(config.Mongo)},
|
||||||
// cm.config.Mongo.GetConfigFileName(): {old: &cm.config.Mongo, new: new(config.Mongo)},
|
cm.config.Notification.GetConfigFileName(): {old: &cm.config.Notification, new: new(config.Notification)},
|
||||||
// cm.config.Notification.GetConfigFileName(): {old: &cm.config.Notification, new: new(config.Notification)},
|
cm.config.API.GetConfigFileName(): {old: &cm.config.API, new: new(config.API)},
|
||||||
// cm.config.API.GetConfigFileName(): {old: &cm.config.API, new: new(config.API)},
|
cm.config.CronTask.GetConfigFileName(): {old: &cm.config.CronTask, new: new(config.CronTask)},
|
||||||
// cm.config.CronTask.GetConfigFileName(): {old: &cm.config.CronTask, new: new(config.CronTask)},
|
cm.config.MsgGateway.GetConfigFileName(): {old: &cm.config.MsgGateway, new: new(config.MsgGateway)},
|
||||||
// cm.config.MsgGateway.GetConfigFileName(): {old: &cm.config.MsgGateway, new: new(config.MsgGateway)},
|
cm.config.MsgTransfer.GetConfigFileName(): {old: &cm.config.MsgTransfer, new: new(config.MsgTransfer)},
|
||||||
// cm.config.MsgTransfer.GetConfigFileName(): {old: &cm.config.MsgTransfer, new: new(config.MsgTransfer)},
|
cm.config.Push.GetConfigFileName(): {old: &cm.config.Push, new: new(config.Push)},
|
||||||
// cm.config.Push.GetConfigFileName(): {old: &cm.config.Push, new: new(config.Push)},
|
cm.config.Auth.GetConfigFileName(): {old: &cm.config.Auth, new: new(config.Auth)},
|
||||||
// cm.config.Auth.GetConfigFileName(): {old: &cm.config.Auth, new: new(config.Auth)},
|
cm.config.Conversation.GetConfigFileName(): {old: &cm.config.Conversation, new: new(config.Conversation)},
|
||||||
// cm.config.Conversation.GetConfigFileName(): {old: &cm.config.Conversation, new: new(config.Conversation)},
|
cm.config.Friend.GetConfigFileName(): {old: &cm.config.Friend, new: new(config.Friend)},
|
||||||
// cm.config.Friend.GetConfigFileName(): {old: &cm.config.Friend, new: new(config.Friend)},
|
cm.config.Group.GetConfigFileName(): {old: &cm.config.Group, new: new(config.Group)},
|
||||||
// cm.config.Group.GetConfigFileName(): {old: &cm.config.Group, new: new(config.Group)},
|
cm.config.Msg.GetConfigFileName(): {old: &cm.config.Msg, new: new(config.Msg)},
|
||||||
// cm.config.Msg.GetConfigFileName(): {old: &cm.config.Msg, new: new(config.Msg)},
|
cm.config.Third.GetConfigFileName(): {old: &cm.config.Third, new: new(config.Third)},
|
||||||
// cm.config.Third.GetConfigFileName(): {old: &cm.config.Third, new: new(config.Third)},
|
cm.config.User.GetConfigFileName(): {old: &cm.config.User, new: new(config.User)},
|
||||||
// cm.config.User.GetConfigFileName(): {old: &cm.config.User, new: new(config.User)},
|
cm.config.Redis.GetConfigFileName(): {old: &cm.config.Redis, new: new(config.Redis)},
|
||||||
// cm.config.Redis.GetConfigFileName(): {old: &cm.config.Redis, new: new(config.Redis)},
|
cm.config.Share.GetConfigFileName(): {old: &cm.config.Share, new: new(config.Share)},
|
||||||
// cm.config.Share.GetConfigFileName(): {old: &cm.config.Share, new: new(config.Share)},
|
cm.config.Webhooks.GetConfigFileName(): {old: &cm.config.Webhooks, new: new(config.Webhooks)},
|
||||||
// cm.config.Webhooks.GetConfigFileName(): {old: &cm.config.Webhooks, new: new(config.Webhooks)},
|
}
|
||||||
// }
|
|
||||||
//
|
changedKeys := make([]string, 0, len(configMap))
|
||||||
// changedKeys := make([]string, 0, len(configMap))
|
for k, v := range configMap {
|
||||||
// for k, v := range configMap {
|
err := config.Load(
|
||||||
// err := config.Load(
|
cm.configPath,
|
||||||
// cm.configPath,
|
k,
|
||||||
// k,
|
config.EnvPrefixMap[k],
|
||||||
// config.EnvPrefixMap[k],
|
cm.runtimeEnv,
|
||||||
// cm.runtimeEnv,
|
v.new,
|
||||||
// v.new,
|
)
|
||||||
// )
|
if err != nil {
|
||||||
// if err != nil {
|
log.ZError(c, "load config failed", err)
|
||||||
// log.ZError(c, "load config failed", err)
|
continue
|
||||||
// continue
|
}
|
||||||
// }
|
equal := reflect.DeepEqual(v.old, v.new)
|
||||||
// equal := reflect.DeepEqual(v.old, v.new)
|
if !checkChange || !equal {
|
||||||
// if !checkChange || !equal {
|
changedKeys = append(changedKeys, k)
|
||||||
// changedKeys = append(changedKeys, k)
|
}
|
||||||
// }
|
}
|
||||||
// }
|
|
||||||
//
|
for _, k := range changedKeys {
|
||||||
// for _, k := range changedKeys {
|
data, err := json.Marshal(configMap[k].new)
|
||||||
// data, err := json.Marshal(configMap[k].new)
|
if err != nil {
|
||||||
// if err != nil {
|
log.ZError(c, "marshal config failed", err)
|
||||||
// log.ZError(c, "marshal config failed", err)
|
continue
|
||||||
// continue
|
}
|
||||||
// }
|
ops = append(ops, clientv3.OpPut(etcd.BuildKey(k), string(data)))
|
||||||
// ops = append(ops, clientv3.OpPut(etcd.BuildKey(k), string(data)))
|
}
|
||||||
// }
|
if len(ops) > 0 {
|
||||||
// if len(ops) > 0 {
|
txn.Then(ops...)
|
||||||
// txn.Then(ops...)
|
_, err := txn.Commit()
|
||||||
// _, err := txn.Commit()
|
if err != nil {
|
||||||
// if err != nil {
|
return errs.WrapMsg(err, "commit etcd txn failed")
|
||||||
// return errs.WrapMsg(err, "commit etcd txn failed")
|
}
|
||||||
// }
|
}
|
||||||
// }
|
return nil
|
||||||
// return nil
|
}
|
||||||
//}
|
|
||||||
//
|
func (cm *ConfigManager) Restart(c *gin.Context) {
|
||||||
//func (cm *ConfigManager) Restart(c *gin.Context) {
|
go cm.restart(c)
|
||||||
// go cm.restart(c)
|
apiresp.GinSuccess(c, nil)
|
||||||
// apiresp.GinSuccess(c, nil)
|
}
|
||||||
//}
|
|
||||||
//
|
func (cm *ConfigManager) restart(c *gin.Context) {
|
||||||
//func (cm *ConfigManager) restart(c *gin.Context) {
|
time.Sleep(waitHttp) // wait for Restart http call return
|
||||||
// time.Sleep(waitHttp) // wait for Restart http call return
|
t := time.Now().Unix()
|
||||||
// t := time.Now().Unix()
|
_, err := cm.client.Put(c, etcd.BuildKey(etcd.RestartKey), strconv.Itoa(int(t)))
|
||||||
// _, err := cm.client.Put(c, etcd.BuildKey(etcd.RestartKey), strconv.Itoa(int(t)))
|
if err != nil {
|
||||||
// if err != nil {
|
log.ZError(c, "restart etcd put key failed", err)
|
||||||
// log.ZError(c, "restart etcd put key failed", err)
|
}
|
||||||
// }
|
}
|
||||||
//}
|
|
||||||
//
|
func (cm *ConfigManager) SetEnableConfigManager(c *gin.Context) {
|
||||||
//func (cm *ConfigManager) SetEnableConfigManager(c *gin.Context) {
|
var req apistruct.SetEnableConfigManagerReq
|
||||||
// if cm.config.Discovery.Enable != config.ETCD {
|
if err := c.BindJSON(&req); err != nil {
|
||||||
// apiresp.GinError(c, errs.New("only etcd support config manager").Wrap())
|
apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
||||||
// return
|
return
|
||||||
// }
|
}
|
||||||
// var req apistruct.SetEnableConfigManagerReq
|
var enableStr string
|
||||||
// if err := c.BindJSON(&req); err != nil {
|
if req.Enable {
|
||||||
// apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap())
|
enableStr = etcd.Enable
|
||||||
// return
|
} else {
|
||||||
// }
|
enableStr = etcd.Disable
|
||||||
// var enableStr string
|
}
|
||||||
// if req.Enable {
|
resp, err := cm.client.Get(c, etcd.BuildKey(etcd.EnableConfigCenterKey))
|
||||||
// enableStr = etcd.Enable
|
if err != nil {
|
||||||
// } else {
|
apiresp.GinError(c, errs.WrapMsg(err, "getEnableConfigManager failed"))
|
||||||
// enableStr = etcd.Disable
|
return
|
||||||
// }
|
}
|
||||||
// resp, err := cm.client.Get(c, etcd.BuildKey(etcd.EnableConfigCenterKey))
|
if !(resp.Count > 0 && string(resp.Kvs[0].Value) == etcd.Enable) && req.Enable {
|
||||||
// if err != nil {
|
go func() {
|
||||||
// apiresp.GinError(c, errs.WrapMsg(err, "getEnableConfigManager failed"))
|
time.Sleep(waitHttp) // wait for Restart http call return
|
||||||
// return
|
err := cm.resetConfig(c, false, clientv3.OpPut(etcd.BuildKey(etcd.EnableConfigCenterKey), enableStr))
|
||||||
// }
|
if err != nil {
|
||||||
// if !(resp.Count > 0 && string(resp.Kvs[0].Value) == etcd.Enable) && req.Enable {
|
log.ZError(c, "resetConfig failed", err)
|
||||||
// go func() {
|
}
|
||||||
// time.Sleep(waitHttp) // wait for Restart http call return
|
}()
|
||||||
// err := cm.resetConfig(c, false, clientv3.OpPut(etcd.BuildKey(etcd.EnableConfigCenterKey), enableStr))
|
} else {
|
||||||
// if err != nil {
|
_, err = cm.client.Put(c, etcd.BuildKey(etcd.EnableConfigCenterKey), enableStr)
|
||||||
// log.ZError(c, "resetConfig failed", err)
|
if err != nil {
|
||||||
// }
|
apiresp.GinError(c, errs.WrapMsg(err, "setEnableConfigManager failed"))
|
||||||
// }()
|
return
|
||||||
// } else {
|
}
|
||||||
// _, err = cm.client.Put(c, etcd.BuildKey(etcd.EnableConfigCenterKey), enableStr)
|
}
|
||||||
// if err != nil {
|
|
||||||
// apiresp.GinError(c, errs.WrapMsg(err, "setEnableConfigManager failed"))
|
apiresp.GinSuccess(c, nil)
|
||||||
// return
|
}
|
||||||
// }
|
|
||||||
// }
|
func (cm *ConfigManager) GetEnableConfigManager(c *gin.Context) {
|
||||||
//
|
resp, err := cm.client.Get(c, etcd.BuildKey(etcd.EnableConfigCenterKey))
|
||||||
// apiresp.GinSuccess(c, nil)
|
if err != nil {
|
||||||
//}
|
apiresp.GinError(c, errs.WrapMsg(err, "getEnableConfigManager failed"))
|
||||||
//
|
return
|
||||||
//func (cm *ConfigManager) GetEnableConfigManager(c *gin.Context) {
|
}
|
||||||
// resp, err := cm.client.Get(c, etcd.BuildKey(etcd.EnableConfigCenterKey))
|
var enable bool
|
||||||
// if err != nil {
|
if resp.Count > 0 && string(resp.Kvs[0].Value) == etcd.Enable {
|
||||||
// apiresp.GinError(c, errs.WrapMsg(err, "getEnableConfigManager failed"))
|
enable = true
|
||||||
// return
|
}
|
||||||
// }
|
apiresp.GinSuccess(c, &apistruct.GetEnableConfigManagerResp{Enable: enable})
|
||||||
// var enable bool
|
}
|
||||||
// if resp.Count > 0 && string(resp.Kvs[0].Value) == etcd.Enable {
|
|
||||||
// enable = true
|
|
||||||
// }
|
|
||||||
// apiresp.GinSuccess(c, &apistruct.GetEnableConfigManagerResp{Enable: enable})
|
|
||||||
//}
|
|
||||||
|
|||||||
@ -0,0 +1,24 @@
|
|||||||
|
package apistruct
|
||||||
|
|
||||||
|
type GetConfigReq struct {
|
||||||
|
ConfigName string `json:"configName"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetConfigListResp struct {
|
||||||
|
Environment string `json:"environment"`
|
||||||
|
Version string `json:"version"`
|
||||||
|
ConfigNames []string `json:"configNames"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SetConfigReq struct {
|
||||||
|
ConfigName string `json:"configName"`
|
||||||
|
Data string `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SetEnableConfigManagerReq struct {
|
||||||
|
Enable bool `json:"enable"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetEnableConfigManagerResp struct {
|
||||||
|
Enable bool `json:"enable"`
|
||||||
|
}
|
||||||
@ -0,0 +1,106 @@
|
|||||||
|
package etcd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"runtime"
|
||||||
|
"sync"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
"github.com/openimsdk/tools/errs"
|
||||||
|
"github.com/openimsdk/tools/log"
|
||||||
|
"github.com/openimsdk/tools/utils/datautil"
|
||||||
|
clientv3 "go.etcd.io/etcd/client/v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ShutDowns []func() error
|
||||||
|
)
|
||||||
|
|
||||||
|
func RegisterShutDown(shutDown ...func() error) {
|
||||||
|
ShutDowns = append(ShutDowns, shutDown...)
|
||||||
|
}
|
||||||
|
|
||||||
|
type ConfigManager struct {
|
||||||
|
client *clientv3.Client
|
||||||
|
watchConfigNames []string
|
||||||
|
lock sync.Mutex
|
||||||
|
}
|
||||||
|
|
||||||
|
func BuildKey(s string) string {
|
||||||
|
return ConfigKeyPrefix + s
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewConfigManager(client *clientv3.Client, configNames []string) *ConfigManager {
|
||||||
|
return &ConfigManager{
|
||||||
|
client: client,
|
||||||
|
watchConfigNames: datautil.Batch(func(s string) string { return BuildKey(s) }, append(configNames, RestartKey))}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *ConfigManager) Watch(ctx context.Context) {
|
||||||
|
chans := make([]clientv3.WatchChan, 0, len(c.watchConfigNames))
|
||||||
|
for _, name := range c.watchConfigNames {
|
||||||
|
chans = append(chans, c.client.Watch(ctx, name, clientv3.WithPrefix()))
|
||||||
|
}
|
||||||
|
|
||||||
|
doWatch := func(watchChan clientv3.WatchChan) {
|
||||||
|
for watchResp := range watchChan {
|
||||||
|
if watchResp.Err() != nil {
|
||||||
|
log.ZError(ctx, "watch err", errs.Wrap(watchResp.Err()))
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
for _, event := range watchResp.Events {
|
||||||
|
if event.IsModify() {
|
||||||
|
if datautil.Contain(string(event.Kv.Key), c.watchConfigNames...) {
|
||||||
|
c.lock.Lock()
|
||||||
|
err := restartServer(ctx)
|
||||||
|
if err != nil {
|
||||||
|
log.ZError(ctx, "restart server err", err)
|
||||||
|
}
|
||||||
|
c.lock.Unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, ch := range chans {
|
||||||
|
go doWatch(ch)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func restartServer(ctx context.Context) error {
|
||||||
|
exePath, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
return errs.New("get executable path fail").Wrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
args := os.Args
|
||||||
|
env := os.Environ()
|
||||||
|
|
||||||
|
cmd := exec.Command(exePath, args[1:]...)
|
||||||
|
cmd.Env = env
|
||||||
|
cmd.Stdout = os.Stdout
|
||||||
|
cmd.Stderr = os.Stderr
|
||||||
|
cmd.Stdin = os.Stdin
|
||||||
|
|
||||||
|
if runtime.GOOS != "windows" {
|
||||||
|
cmd.SysProcAttr = &syscall.SysProcAttr{}
|
||||||
|
}
|
||||||
|
log.ZInfo(ctx, "shutdown server")
|
||||||
|
for _, f := range ShutDowns {
|
||||||
|
if err = f(); err != nil {
|
||||||
|
log.ZError(ctx, "shutdown fail", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log.ZInfo(ctx, "restart server")
|
||||||
|
err = cmd.Start()
|
||||||
|
if err != nil {
|
||||||
|
return errs.New("restart server fail").Wrap()
|
||||||
|
}
|
||||||
|
log.ZInfo(ctx, "cmd start over")
|
||||||
|
|
||||||
|
os.Exit(0)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
package etcd
|
||||||
|
|
||||||
|
const (
|
||||||
|
ConfigKeyPrefix = "/open-im/config/"
|
||||||
|
RestartKey = "restart"
|
||||||
|
EnableConfigCenterKey = "enable-config-center"
|
||||||
|
Enable = "enable"
|
||||||
|
Disable = "disable"
|
||||||
|
)
|
||||||
Loading…
Reference in new issue