feat: add git chglog pull request

pull/1906/head
Xinwei Xiong (cubxxw) 2 years ago
parent ea248391b8
commit db1f1284f4

@ -92,6 +92,7 @@ jobs:
- name: Exec OpenIM API test - name: Exec OpenIM API test
run: | run: |
sudo make test-api
mkdir -p ./tmp mkdir -p ./tmp
touch ./tmp/test.md touch ./tmp/test.md
echo "# OpenIM Test" >> ./tmp/test.md echo "# OpenIM Test" >> ./tmp/test.md

@ -75,12 +75,14 @@ func run(port int, proPort int) error {
} }
if err = client.RegisterConf2Registry(constant.OpenIMCommonConfigKey, config.Config.EncodeConfig()); err != nil { if err = client.RegisterConf2Registry(constant.OpenIMCommonConfigKey, config.Config.EncodeConfig()); err != nil {
return err return errs.Wrap(err, "register config to registry error")
} }
var ( var (
netDone = make(chan struct{}, 1) netDone = make(chan struct{}, 1)
netErr error netErr error
) )
router := api.NewGinRouter(client, rdb) router := api.NewGinRouter(client, rdb)
if config.Config.Prometheus.Enable { if config.Config.Prometheus.Enable {
go func() { go func() {
@ -91,7 +93,6 @@ func run(port int, proPort int) error {
netDone <- struct{}{} netDone <- struct{}{}
} }
}() }()
} }
var address string var address string
@ -108,7 +109,6 @@ func run(port int, proPort int) error {
if err != nil && err != http.ErrServerClosed { if err != nil && err != http.ErrServerClosed {
netErr = errs.Wrap(err, fmt.Sprintf("api start err: %s", server.Addr)) netErr = errs.Wrap(err, fmt.Sprintf("api start err: %s", server.Addr))
netDone <- struct{}{} netDone <- struct{}{}
} }
}() }()

@ -30,6 +30,7 @@ import (
type RootCmdPt interface { type RootCmdPt interface {
GetPortFromConfig(portType string) int GetPortFromConfig(portType string) int
} }
type RootCmd struct { type RootCmd struct {
Command cobra.Command Command cobra.Command
Name string Name string

@ -24,7 +24,6 @@ import (
) )
func NewGrpcPromObj(cusMetrics []prometheus.Collector) (*prometheus.Registry, *gp.ServerMetrics, error) { func NewGrpcPromObj(cusMetrics []prometheus.Collector) (*prometheus.Registry, *gp.ServerMetrics, error) {
////////////////////////////////////////////////////////
reg := prometheus.NewRegistry() reg := prometheus.NewRegistry()
grpcMetrics := gp.NewServerMetrics() grpcMetrics := gp.NewServerMetrics()
grpcMetrics.EnableHandlingTimeHistogram() grpcMetrics.EnableHandlingTimeHistogram()

Loading…
Cancel
Save