optimised code

This commit is contained in:
zhuyasen
2023-12-14 19:50:41 +08:00
parent 1d81ccb27c
commit 3857f46bd1
36 changed files with 202 additions and 125 deletions

View File

@@ -11,8 +11,8 @@ import (
"github.com/zhufuyi/sponge/pkg/tracer"
)
// RegisterClose register for released resources
func RegisterClose(servers []app.IServer) []app.Close {
// Close releasing resources after service exit
func Close(servers []app.IServer) []app.Close {
var closes []app.Close
// close server

View File

@@ -16,14 +16,14 @@ import (
"github.com/zhufuyi/sponge/pkg/servicerd/registry/nacos"
)
// RegisterServers register for the app service
func RegisterServers() []app.IServer {
// CreateServices create grpc or http service
func CreateServices() []app.IServer {
var cfg = config.Get()
var servers []app.IServer
// creating grpc service
grpcAddr := ":" + strconv.Itoa(cfg.Grpc.Port)
grpcRegistry, grpcInstance := registryService("grpc", cfg.App.Host, cfg.Grpc.Port)
grpcRegistry, grpcInstance := registerService("grpc", cfg.App.Host, cfg.Grpc.Port)
grpcServer := server.NewGRPCServer(grpcAddr,
server.WithGrpcReadTimeout(time.Duration(cfg.Grpc.ReadTimeout)*time.Second),
server.WithGrpcWriteTimeout(time.Duration(cfg.Grpc.WriteTimeout)*time.Second),
@@ -34,7 +34,7 @@ func RegisterServers() []app.IServer {
return servers
}
func registryService(scheme string, host string, port int) (registry.Registry, *registry.ServiceInstance) {
func registerService(scheme string, host string, port int) (registry.Registry, *registry.ServiceInstance) {
var (
instanceEndpoint = fmt.Sprintf("%s://%s:%d", scheme, host, port)
cfg = config.Get()

View File

@@ -12,6 +12,7 @@ import (
"github.com/zhufuyi/sponge/internal/config"
"github.com/zhufuyi/sponge/internal/model"
"github.com/zhufuyi/sponge/pkg/conf"
"github.com/zhufuyi/sponge/pkg/logger"
"github.com/zhufuyi/sponge/pkg/nacoscli"
"github.com/zhufuyi/sponge/pkg/stat"
@@ -26,8 +27,8 @@ var (
enableConfigCenter bool
)
// Config initial app configuration
func Config() {
// InitApp initial app configuration
func InitApp() {
initConfig()
cfg := config.Get()
@@ -40,9 +41,12 @@ func Config() {
if err != nil {
panic(err)
}
logger.Debug(config.Show())
logger.Info("init logger succeeded")
// initializing database
model.InitMysql()
logger.Info("init mysql succeeded")
model.InitCache(cfg.App.CacheType)
// initializing tracing
@@ -55,6 +59,7 @@ func Config() {
strconv.Itoa(cfg.Jaeger.AgentPort),
cfg.App.TracingSamplingRate,
)
logger.Info("init tracer succeeded")
}
// initializing the print system and process resources
@@ -63,6 +68,7 @@ func Config() {
stat.WithLog(logger.Get()),
stat.WithAlarm(), // invalid if it is windows, the default threshold for cpu and memory is 0.8, you can modify them
)
logger.Info("init statistics succeeded")
}
}
@@ -86,10 +92,14 @@ func initConfig() {
appConfig := &config.Config{}
params := &nacoscli.Params{}
_ = copier.Copy(params, &nacosConfig.Nacos)
err = nacoscli.Init(appConfig, params)
format, data, err := nacoscli.GetConfig(params)
if err != nil {
panic(fmt.Sprintf("connect to configuration center err, %v", err))
}
err = conf.ParseConfigData(data, format, appConfig)
if err != nil {
panic(fmt.Sprintf("parse configuration data err, %v", err))
}
if appConfig.App.Name == "" {
panic("read the config from center error, config data is empty")
}
@@ -108,5 +118,4 @@ func initConfig() {
if version != "" {
config.Get().App.Version = version
}
//fmt.Println(config.Show())
}

View File

@@ -8,10 +8,10 @@ import (
)
func main() {
initial.Config()
servers := initial.RegisterServers()
closes := initial.RegisterClose(servers)
initial.InitApp()
services := initial.CreateServices()
closes := initial.Close(services)
a := app.New(servers, closes)
a := app.New(services, closes)
a.Run()
}