blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-02 18:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix the make stop output format error

Browse Source
This commit is contained in:
luhaoling 2024-02-19 14:44:57 +08:00
parent cc9d460df1
commit f0aa9d379c
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/openim-api/main.go
View File

@ -119,7 +119,6 @@ func run(port int, proPort int) error {
defer cancel() defer cancel()
select { select {
case <-sigs: case <-sigs:
util.SIGUSR1Exit()
err := server.Shutdown(ctx) err := server.Shutdown(ctx)
if err != nil { if err != nil {
return errs.Wrap(err, "shutdown err") return errs.Wrap(err, "shutdown err")

4
internal/msggateway/init.go
View File

@ -46,9 +46,7 @@ func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error {
netDone := make(chan error) netDone := make(chan error)
go func() { go func() {
err = hubServer.Start() err = hubServer.Start()
if err != nil { netDone <- err
netDone <- err
}
}() }()
return hubServer.LongConnServer.Run(netDone) return hubServer.LongConnServer.Run(netDone)
} }

3
internal/msgtransfer/init.go
View File

@ -22,8 +22,6 @@ import (
"github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/log"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"
@ -144,7 +142,6 @@ func (m *MsgTransfer) Start(prometheusPort int) error {
signal.Notify(sigs, syscall.SIGTERM) signal.Notify(sigs, syscall.SIGTERM)
select { select {
case <-sigs: case <-sigs:
util.SIGUSR1Exit()
// graceful close kafka client. // graceful close kafka client.
m.cancel() m.cancel()
m.historyCH.historyConsumerGroup.Close() m.historyCH.historyConsumerGroup.Close()

5
pkg/common/startrpc/start.go
View File

@ -29,8 +29,6 @@ import (
"github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/errs"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
@ -140,7 +138,6 @@ func Start(
signal.Notify(sigs, syscall.SIGTERM) signal.Notify(sigs, syscall.SIGTERM)
select { select {
case <-sigs: case <-sigs:
util.SIGUSR1Exit()
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
defer cancel() defer cancel()
if err := gracefulStopWithCtx(ctx, srv.GracefulStop); err != nil { if err := gracefulStopWithCtx(ctx, srv.GracefulStop); err != nil {
@ -152,11 +149,11 @@ func Start(
if err != nil { if err != nil {
return errs.Wrap(err, "shutdown err") return errs.Wrap(err, "shutdown err")
} }
return errs.Wrap(errors.New("SIGTERM EXIT"))
case <-netDone: case <-netDone:
close(netDone) close(netDone)
return netErr return netErr
} }
return nil
} }
func gracefulStopWithCtx(ctx context.Context, f func()) error { func gracefulStopWithCtx(ctx context.Context, f func()) error {