adjustment code

This commit is contained in:
zhuyasen
2022-11-19 23:21:58 +08:00
parent a03d5629e1
commit 116070c00c
113 changed files with 1216 additions and 1192 deletions

View File

@@ -23,23 +23,23 @@ var (
enableConfigCenter bool
)
// Config 初始化配置
// Config initial app configuration
func Config() {
initConfig()
cfg := config.Get()
// 初始化日志
// initializing log
_, _ = logger.Init(
logger.WithLevel(cfg.Logger.Level),
logger.WithFormat(cfg.Logger.Format),
logger.WithSave(cfg.Logger.IsSave),
)
// 初始化数据库
// initializing database
model.InitMysql()
model.InitCache(cfg.App.CacheType)
// 初始化链路跟踪
// initializing tracing
if cfg.App.EnableTracing {
tracer.InitWithConfig(
cfg.App.Name,
@@ -51,13 +51,12 @@ func Config() {
)
}
// 初始化打印系统和进程资源
// initializing the print system and process resources
if cfg.App.EnableStat {
stat.Init(stat.WithLog(logger.Get()))
}
}
// 初始化配置
func initConfig() {
flag.StringVar(&version, "version", "", "service Version Number")
flag.BoolVar(&enableConfigCenter, "enable-cc", false, "whether to get from the configuration center, "+
@@ -66,7 +65,8 @@ func initConfig() {
flag.Parse()
if enableConfigCenter {
// 从配置中心获取配置(先获取nacos配置再根据nacos配置中心读取服务配置)
// get the configuration from the configuration center (first get the nacos configuration,
// then read the service configuration according to the nacos configuration center)
if configFile == "" {
configFile = configs.Path("serverNameExample_cc.yml")
}
@@ -86,7 +86,7 @@ func initConfig() {
}
config.Set(appConfig)
} else {
// 从本地配置文件获取配置
// get configuration from local configuration file
if configFile == "" {
configFile = configs.Path("serverNameExample.yml")
}

View File

@@ -11,28 +11,28 @@ import (
"github.com/zhufuyi/sponge/pkg/tracer"
)
// RegisterClose 注册app需要释放的资源
// RegisterClose register for released resources
func RegisterClose(servers []app.IServer) []app.Close {
var closes []app.Close
// 关闭服务
// close server
for _, s := range servers {
closes = append(closes, s.Stop)
}
// 关闭mysql
// close mysql
closes = append(closes, func() error {
return model.CloseMysql()
})
// 关闭redis
// close redis
if config.Get().App.CacheType == "redis" {
closes = append(closes, func() error {
return model.CloseRedis()
})
}
// 关闭trace
// close tracing
if config.Get().App.EnableTracing {
closes = append(closes, func() error {
ctx, _ := context.WithTimeout(context.Background(), 2*time.Second) //nolint

View File

@@ -15,12 +15,12 @@ import (
"github.com/zhufuyi/sponge/pkg/servicerd/registry/nacos"
)
// RegisterServers 注册app服务
// RegisterServers register for the app service
func RegisterServers() []app.IServer {
var cfg = config.Get()
var servers []app.IServer
// 创建grpc服务
// creating grpc service
grpcAddr := ":" + strconv.Itoa(cfg.Grpc.Port)
grpcRegistry, grpcInstance := registryService("grpc", cfg.App.Host, cfg.Grpc.Port)
grpcServer := server.NewGRPCServer(grpcAddr,
@@ -38,7 +38,7 @@ func registryService(scheme string, host string, port int) (registry.Registry, *
cfg := config.Get()
switch cfg.App.RegistryDiscoveryType {
// 使用consul注册服务
// registering service with consul
case "consul":
iRegistry, instance, err := consul.NewRegistry(
cfg.Consul.Addr,
@@ -50,7 +50,7 @@ func registryService(scheme string, host string, port int) (registry.Registry, *
panic(err)
}
return iRegistry, instance
// 使用etcd注册服务
// registering service with etcd
case "etcd":
iRegistry, instance, err := etcd.NewRegistry(
cfg.Etcd.Addrs,
@@ -62,7 +62,7 @@ func registryService(scheme string, host string, port int) (registry.Registry, *
panic(err)
}
return iRegistry, instance
// 使用nacos注册服务
// registering service with nacos
case "nacos":
iRegistry, instance, err := nacos.NewRegistry(
cfg.NacosRd.IPAddr,