feat jenkins cicd
This commit is contained in:
@@ -22,7 +22,7 @@ func (p *Program) Init(_ svc.Environment) error {
|
||||
p.moduleList = append(p.moduleList, &ModuleBase{})
|
||||
p.moduleList = append(p.moduleList, &ModuleDB{})
|
||||
p.moduleList = append(p.moduleList, &ModulePrometheus{})
|
||||
p.moduleList = append(p.moduleList, &ModuleGrpcGateway{})
|
||||
p.moduleList = append(p.moduleList, &ModuleWebServer{})
|
||||
p.moduleList = append(p.moduleList, &ModuleWebsocketServer{})
|
||||
p.moduleList = append(p.moduleList, &ModuleGrpcServer{})
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ func (m *ModulePrometheus) start() error {
|
||||
go func() {
|
||||
defer m.wg.Done()
|
||||
m.server = &http.Server{
|
||||
Addr: fmt.Sprintf("%v:%v", config.Get().Monitor.Prometheus.Address, config.Get().Monitor.Prometheus.Port),
|
||||
Addr: fmt.Sprintf("%v:%v", config.Get().Metric.Prometheus.Address, config.Get().Metric.Prometheus.Port),
|
||||
Handler: promhttp.Handler(),
|
||||
}
|
||||
if err := m.server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
||||
|
||||
@@ -2,7 +2,6 @@ package app
|
||||
|
||||
import (
|
||||
"common/log"
|
||||
"common/net/grpc/service"
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
@@ -12,20 +11,18 @@ import (
|
||||
"sync"
|
||||
)
|
||||
|
||||
// ModuleGrpcGateway GrpcGateway服务模块
|
||||
type ModuleGrpcGateway struct {
|
||||
wg *sync.WaitGroup
|
||||
// 微服务列表
|
||||
services []service.IService
|
||||
server *http.Server
|
||||
// ModuleWebServer Web服务模块
|
||||
type ModuleWebServer struct {
|
||||
wg *sync.WaitGroup
|
||||
server *http.Server
|
||||
}
|
||||
|
||||
func (m *ModuleGrpcGateway) init() error {
|
||||
func (m *ModuleWebServer) init() error {
|
||||
m.wg = &sync.WaitGroup{}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ModuleGrpcGateway) start() error {
|
||||
func (m *ModuleWebServer) start() error {
|
||||
m.wg.Add(1)
|
||||
go func() {
|
||||
defer m.wg.Done()
|
||||
@@ -41,7 +38,7 @@ func (m *ModuleGrpcGateway) start() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (m *ModuleGrpcGateway) stop() error {
|
||||
func (m *ModuleWebServer) stop() error {
|
||||
if err := m.server.Shutdown(context.Background()); err != nil {
|
||||
log.Errorf("stop http server failed: %v", err)
|
||||
}
|
||||
Reference in New Issue
Block a user