feat app 模块化启动

Server/scene/app/app.go

@@ -1,63 +1,58 @@
 package app
 
 import (
-	"common/db/etcd"
 	"common/discover"
 	"common/log"
-	"common/net/grpc/service"
 	"fmt"
 	"github.com/judwhite/go-svc"
-	"runtime/debug"
 	"scene/config"
-	"scene/grpc_server/server"
-	"sync"
 )
 
 type Program struct {
-	wg     *sync.WaitGroup
-	server service.IService // grpc服务
-	stop   chan bool
+	moduleList []Module // 模块列表
+}
+
+type Module interface {
+	Init() error
+	Start() error
+	Stop() error
 }
 
 func (p *Program) Init(_ svc.Environment) error {
-	if err := p.initBase(); err != nil {
-		return err
-	}
-	cfg := config.Get()
-	log.Infof(fmt.Sprintf("%v starting...", cfg.App.Name))
-	if err := p.initDB(cfg); err != nil {
-		return err
+	p.moduleList = append(p.moduleList, &ModuleBase{})
+	p.moduleList = append(p.moduleList, &ModuleDB{})
+	p.moduleList = append(p.moduleList, &ModuleGrpcServer{})
+
+	for _, module := range p.moduleList {
+		if err := module.Init(); err != nil {
+			return err
+		}
 	}
+	log.Infof(fmt.Sprintf("%v Init successful...", config.Get().App.Name))
 	return nil
 }
 
 func (p *Program) Start() error {
-	defer func() {
-		if err := recover(); err != nil {
-			fmt.Printf("Start err: %v", err)
-			debug.PrintStack()
-			_ = p.Stop()
+	for _, module := range p.moduleList {
+		if err := module.Start(); err != nil {
+			return err
 		}
-	}()
-
+	}
 	discover.Listen()
-	p.server = server.NewServer(config.Get().Serve.Grpc.TTL)
-	p.server.Init(config.Get().Serve.Grpc.Address, config.Get().Serve.Grpc.Port)
 
+	log.Infof(fmt.Sprintf("%v Start successful...", config.Get().App.Name))
 	return nil
 }
 
 func (p *Program) Stop() error {
-	defer func() {
-		if err := recover(); err != nil {
-			fmt.Printf("Stop err: %v", err)
-			debug.PrintStack()
-		}
-	}()
-
 	discover.Close()
-	p.server.Close()
-	_ = etcd.Close()
+	for i := len(p.moduleList) - 1; i >= 0; i-- {
+		module := p.moduleList[i]
+		if err := module.Stop(); err != nil {
+			log.Errorf("module stop error: %v", err)
+		}
+	}
 
+	log.Infof(fmt.Sprintf("%v Stop successful...", config.Get().App.Name))
 	return nil
 }

Server/scene/app/base.go

@@ -7,7 +7,11 @@ import (
 	"scene/config"
 )
 
-func (p *Program) initBase() error {
+// ModuleBase 基础模块，或者一些零散的模块
+type ModuleBase struct {
+}
+
+func (p *ModuleBase) Init() error {
 	// 配置
 	if err := config.LoadConfig(); err != nil {
 		return err
@@ -17,6 +21,13 @@ func (p *Program) initBase() error {
 	log.Init(cfg.Log.Debug, cfg.Log.MaxSize, cfg.Log.MaxBackups, cfg.Log.MaxAge, cfg.Log.Level)
 	// 雪花
 	utils.InitSnowflake(int64(rand.Intn(1000)))
-
+	return nil
+}
+
+func (p *ModuleBase) Start() error {
+	return nil
+}
+
+func (p *ModuleBase) Stop() error {
 	return nil
 }

Server/scene/app/db.go

@@ -2,10 +2,16 @@ package app
 
 import (
 	"common/db/etcd"
+	"common/log"
 	"scene/config"
 )
 
-func (p *Program) initDB(cfg *config.Config) error {
+// ModuleDB 数据库模块
+type ModuleDB struct {
+}
+
+func (p *ModuleDB) Init() error {
+	cfg := config.Get()
 	// ETCD
 	if err := etcd.Init(cfg.DB.Etcd.Address); err != nil {
 		return err
@@ -13,8 +19,13 @@ func (p *Program) initDB(cfg *config.Config) error {
 	return nil
 }
 
-func (p *Program) stopDB() error {
-	_ = etcd.Close()
-
+func (p *ModuleDB) Start() error {
+	return nil
+}
+
+func (p *ModuleDB) Stop() error {
+	if err := etcd.Close(); err != nil {
+		log.Errorf("close etcd failed: %v", err)
+	}
 	return nil
 }

Server/scene/app/grpc.go

@@ -0,0 +1,27 @@
+package app
+
+import (
+	"common/net/grpc/service"
+	"scene/config"
+	"scene/grpc_server/server"
+)
+
+// ModuleGrpcServer Grpc服务模块
+type ModuleGrpcServer struct {
+	server service.IService
+}
+
+func (m *ModuleGrpcServer) Init() error {
+	return nil
+}
+
+func (m *ModuleGrpcServer) Start() error {
+	m.server = server.NewServer(config.Get().Serve.Grpc.TTL)
+	m.server.Init(config.Get().Serve.Grpc.Address, config.Get().Serve.Grpc.Port)
+	return nil
+}
+
+func (m *ModuleGrpcServer) Stop() error {
+	m.server.Close()
+	return nil
+}