msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

fix: refactoring code of graceful exits ()

Browse Source 
* fix: plant a layer

* fix: print chanal

* fix: print sigs

* fix: print the sigs

* fix: reconstruct exit gracefully

* fix: fix the timeout

* fix: fix the netDone

* fix: fix the process exit

* fix: refactor the elegant startup code

* fix: fix the Signal.Notify

* fix: fix the code

* fix: remove not used header import.

* Update init.go

* fix: fix the InitConfig error

* fix: fix branch name

* fix: fix the signal value

* fix: replace the signal with SIGTERM

* fix: fix the script

* fix: fix the unsolve error

* fix: return the SIGTERM received,shutting down

* fix: fix the tranfer exit error

* fix: fix the error

* fix: replace the SIGnal

* fix: del the error return in tranfer

* fix: fix SIGTERM error

* fix: del the unreachalbe code

* fix: fix the make stop print  error

---------

Co-authored-by: OpenIM-Gordon <46924906+FGadvancer@users.noreply.github.com>
Co-authored-by: Xinwei Xiong (cubxxw) <3293172751nss@gmail.com>
pull/1919/head
Brabem 1 year ago committed by GitHub
parent cbce4dae87
commit c754ec6e97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with 241 additions and 268 deletions

44
cmd/openim-api/main.go
Unescape View File

@ -17,6 +17,7 @@ package main
import ( import (
"context" "context"
"fmt" "fmt"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
"net" "net"
"net/http" "net/http"
_ "net/http/pprof" _ "net/http/pprof"
@ -46,8 +47,7 @@ func main() {
apiCmd.AddPrometheusPortFlag() apiCmd.AddPrometheusPortFlag()
apiCmd.AddApi(run) apiCmd.AddApi(run)
if err := apiCmd.Execute(); err != nil { if err := apiCmd.Execute(); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }
@ -76,12 +76,21 @@ 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 err
} }
var (
netDone = make(chan struct{}, 1)
netErr error
)
router := api.NewGinRouter(client, rdb) router := api.NewGinRouter(client, rdb)
if config.Config.Prometheus.Enable { if config.Config.Prometheus.Enable {
p := ginprom.NewPrometheus("app", prommetrics.GetGinCusMetrics("Api")) go func() {
p.SetListenAddress(fmt.Sprintf(":%d", proPort)) p := ginprom.NewPrometheus("app", prommetrics.GetGinCusMetrics("Api"))
p.Use(router) p.SetListenAddress(fmt.Sprintf(":%d", proPort))
if err = p.Use(router); err != nil && err != http.ErrServerClosed {
netErr = errs.Wrap(err, fmt.Sprintf("prometheus start err: %d", proPort))
netDone <- struct{}{}
}
}()
} }
var address string var address string
@ -92,24 +101,31 @@ func run(port int, proPort int) error {
} }
server := http.Server{Addr: address, Handler: router} server := http.Server{Addr: address, Handler: router}
go func() { go func() {
err = server.ListenAndServe() err = server.ListenAndServe()
if err != nil && err != http.ErrServerClosed { if err != nil && err != http.ErrServerClosed {
os.Exit(1) netErr = errs.Wrap(err, fmt.Sprintf("api start err: %s", server.Addr))
netDone <- struct{}{}
} }
}() }()
sigs := make(chan os.Signal, 1) sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT) signal.Notify(sigs, syscall.SIGTERM)
<-sigs
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
defer cancel() defer cancel()
select {
// graceful shutdown operation. case <-sigs:
if err := server.Shutdown(ctx); err != nil { util.SIGUSR1Exit()
return err err := server.Shutdown(ctx)
if err != nil {
return errs.Wrap(err, "shutdown err")
}
case <-netDone:
close(netDone)
return netErr
} }
return nil return nil
} }

7
cmd/openim-cmdutils/main.go
Unescape View File

@ -15,10 +15,8 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -57,7 +55,6 @@ func main() {
// openIM clear msg --clearAll // openIM clear msg --clearAll
msgUtilsCmd.AddCommand(&getCmd.Command, &fixCmd.Command, &clearCmd.Command) msgUtilsCmd.AddCommand(&getCmd.Command, &fixCmd.Command, &clearCmd.Command)
if err := msgUtilsCmd.Execute(); err != nil { if err := msgUtilsCmd.Execute(); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-crontask/main.go
Unescape View File

@ -15,17 +15,14 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/internal/tools" "github.com/openimsdk/open-im-server/v3/internal/tools"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
cronTaskCmd := cmd.NewCronTaskCmd() cronTaskCmd := cmd.NewCronTaskCmd()
if err := cronTaskCmd.Exec(tools.StartTask); err != nil { if err := cronTaskCmd.Exec(tools.StartTask); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-msggateway/main.go
Unescape View File

@ -15,10 +15,8 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -28,7 +26,6 @@ func main() {
msgGatewayCmd.AddPrometheusPortFlag() msgGatewayCmd.AddPrometheusPortFlag()
if err := msgGatewayCmd.Exec(); err != nil { if err := msgGatewayCmd.Exec(); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-msgtransfer/main.go
Unescape View File

@ -15,10 +15,8 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -26,7 +24,6 @@ func main() {
msgTransferCmd.AddPrometheusPortFlag() msgTransferCmd.AddPrometheusPortFlag()
msgTransferCmd.AddTransferProgressFlag() msgTransferCmd.AddTransferProgressFlag()
if err := msgTransferCmd.Exec(); err != nil { if err := msgTransferCmd.Exec(); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-push/main.go
Unescape View File

@ -15,12 +15,10 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/internal/push" "github.com/openimsdk/open-im-server/v3/internal/push"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -31,7 +29,6 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
if err := pushCmd.StartSvr(config.Config.RpcRegisterName.OpenImPushName, push.Start); err != nil { if err := pushCmd.StartSvr(config.Config.RpcRegisterName.OpenImPushName, push.Start); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

8
cmd/openim-rpc/openim-rpc-auth/main.go
Unescape View File

@ -15,12 +15,10 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/internal/rpc/auth" "github.com/openimsdk/open-im-server/v3/internal/rpc/auth"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -31,7 +29,7 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
if err := authCmd.StartSvr(config.Config.RpcRegisterName.OpenImAuthName, auth.Start); err != nil { if err := authCmd.StartSvr(config.Config.RpcRegisterName.OpenImAuthName, auth.Start); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-rpc/openim-rpc-conversation/main.go
Unescape View File

@ -15,12 +15,10 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/internal/rpc/conversation" "github.com/openimsdk/open-im-server/v3/internal/rpc/conversation"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -31,7 +29,6 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImConversationName, conversation.Start); err != nil { if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImConversationName, conversation.Start); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-rpc/openim-rpc-friend/main.go
Unescape View File

@ -15,12 +15,10 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/internal/rpc/friend" "github.com/openimsdk/open-im-server/v3/internal/rpc/friend"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -31,7 +29,6 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImFriendName, friend.Start); err != nil { if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImFriendName, friend.Start); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-rpc/openim-rpc-group/main.go
Unescape View File

@ -15,12 +15,10 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/internal/rpc/group" "github.com/openimsdk/open-im-server/v3/internal/rpc/group"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -31,7 +29,6 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImGroupName, group.Start); err != nil { if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImGroupName, group.Start); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-rpc/openim-rpc-msg/main.go
Unescape View File

@ -15,12 +15,10 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/internal/rpc/msg" "github.com/openimsdk/open-im-server/v3/internal/rpc/msg"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -31,7 +29,6 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImMsgName, msg.Start); err != nil { if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImMsgName, msg.Start); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-rpc/openim-rpc-third/main.go
Unescape View File

@ -15,12 +15,10 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/internal/rpc/third" "github.com/openimsdk/open-im-server/v3/internal/rpc/third"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -31,7 +29,6 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImThirdName, third.Start); err != nil { if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImThirdName, third.Start); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

7
cmd/openim-rpc/openim-rpc-user/main.go
Unescape View File

@ -15,12 +15,10 @@
package main package main
import ( import (
"fmt"
"os"
"github.com/openimsdk/open-im-server/v3/internal/rpc/user" "github.com/openimsdk/open-im-server/v3/internal/rpc/user"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd" "github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
) )
func main() { func main() {
@ -31,7 +29,6 @@ func main() {
panic(err.Error()) panic(err.Error())
} }
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImUserName, user.Start); err != nil { if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImUserName, user.Start); err != nil {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v\n\n", err) util.ExitWithError(err)
os.Exit(-1)
} }
} }

21
internal/msggateway/init.go
Unescape View File

@ -18,9 +18,6 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/OpenIMSDK/tools/utils"
"golang.org/x/sync/errgroup"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
) )
@ -46,20 +43,12 @@ func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error {
} }
hubServer := NewServer(rpcPort, prometheusPort, longServer) hubServer := NewServer(rpcPort, prometheusPort, longServer)
netDone := make(chan error)
wg := errgroup.Group{} go func() {
wg.Go(func() error {
err = hubServer.Start() err = hubServer.Start()
if err != nil { if err != nil {
return utils.Wrap1(err) netDone <- err
} }
return err }()
}) return hubServer.LongConnServer.Run(netDone)
wg.Go(func() error {
return hubServer.LongConnServer.Run()
})
err = wg.Wait()
return err
} }

67
internal/msggateway/n_ws_server.go
Unescape View File

@ -20,12 +20,9 @@ import (
"errors" "errors"
"fmt" "fmt"
"net/http" "net/http"
"os"
"os/signal"
"strconv" "strconv"
"sync" "sync"
"sync/atomic" "sync/atomic"
"syscall"
"time" "time"
"github.com/OpenIMSDK/tools/apiresp" "github.com/OpenIMSDK/tools/apiresp"
@ -49,7 +46,7 @@ import (
) )
type LongConnServer interface { type LongConnServer interface {
Run() error Run(done chan error) error
wsHandler(w http.ResponseWriter, r *http.Request) wsHandler(w http.ResponseWriter, r *http.Request)
GetUserAllCons(userID string) ([]*Client, bool) GetUserAllCons(userID string) ([]*Client, bool)
GetUserPlatformCons(userID string, platform int) ([]*Client, bool, bool) GetUserPlatformCons(userID string, platform int) ([]*Client, bool, bool)
@ -169,23 +166,20 @@ func NewWsServer(opts ...Option) (*WsServer, error) {
}, nil }, nil
} }
func (ws *WsServer) Run() error { func (ws *WsServer) Run(done chan error) error {
var ( var (
client *Client client *Client
wg errgroup.Group netErr error
shutdownDone = make(chan struct{}, 1)
sigs = make(chan os.Signal, 1)
done = make(chan struct{}, 1)
) )
server := http.Server{Addr: ":" + utils.IntToString(ws.port), Handler: nil} server := http.Server{Addr: ":" + utils.IntToString(ws.port), Handler: nil}
wg.Go(func() error { go func() {
for { for {
select { select {
case <-done: case <-shutdownDone:
return nil return
case client = <-ws.registerChan: case client = <-ws.registerChan:
ws.registerClient(client) ws.registerClient(client)
case client = <-ws.unregisterChan: case client = <-ws.unregisterChan:
@ -194,33 +188,32 @@ func (ws *WsServer) Run() error {
ws.multiTerminalLoginChecker(onlineInfo.clientOK, onlineInfo.oldClients, onlineInfo.newClient) ws.multiTerminalLoginChecker(onlineInfo.clientOK, onlineInfo.oldClients, onlineInfo.newClient)
} }
} }
}) }()
netDone := make(chan struct{}, 1)
wg.Go(func() error {
http.HandleFunc("/", ws.wsHandler)
return server.ListenAndServe()
})
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
<-sigs
go func() { go func() {
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) http.HandleFunc("/", ws.wsHandler)
defer cancel() err := server.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
// graceful exit operation for server netErr = errs.Wrap(err, "ws start err", server.Addr)
_ = server.Shutdown(ctx) close(netDone)
_ = wg.Wait() }
close(done)
}() }()
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
defer cancel()
var err error
select { select {
case <-done: case err = <-done:
return nil sErr := server.Shutdown(ctx)
if sErr != nil {
case <-time.After(15 * time.Second): return errs.Wrap(sErr, "shutdown err")
return utils.Wrap1(errors.New("timeout exit")) }
close(shutdownDone)
if err != nil {
return err
}
case <-netDone:
} }
return netErr
} }

91
internal/msgtransfer/init.go
Unescape View File

@ -18,23 +18,11 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"net/http"
"os"
"os/signal"
"sync"
"syscall"
"time"
"github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/log"
"github.com/OpenIMSDK/tools/mw" util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors"
"github.com/prometheus/client_golang/prometheus/promhttp"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"github.com/OpenIMSDK/tools/mw"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache" "github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/controller" "github.com/openimsdk/open-im-server/v3/pkg/common/db/controller"
@ -42,12 +30,22 @@ import (
kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister" kdisc "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister"
"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
"github.com/openimsdk/open-im-server/v3/pkg/rpcclient" "github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors"
"github.com/prometheus/client_golang/prometheus/promhttp"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"net/http"
"os"
"os/signal"
"syscall"
) )
type MsgTransfer struct { type MsgTransfer struct {
historyCH *OnlineHistoryRedisConsumerHandler // 这个消费者聚合消息, 订阅的topic：ws2ms_chat, 修改通知发往msg_to_modify topic, 消息存入redis后Incr Redis, 再发消息到ms2pschat topic推送， 发消息到msg_to_mongo topic持久化 historyCH *OnlineHistoryRedisConsumerHandler // 这个消费者聚合消息, 订阅的topic：ws2ms_chat, 修改通知发往msg_to_modify topic, 消息存入redis后Incr Redis, 再发消息到ms2pschat topic推送， 发消息到msg_to_mongo topic持久化
historyMongoCH *OnlineHistoryMongoConsumerHandler // mongoDB批量插入, 成功后删除redis中消息，以及处理删除通知消息删除的 订阅的topic: msg_to_mongo historyMongoCH *OnlineHistoryMongoConsumerHandler // mongoDB批量插入, 成功后删除redis中消息，以及处理删除通知消息删除的 订阅的topic: msg_to_mongo
// modifyCH *ModifyMsgConsumerHandler // 负责消费修改消息通知的consumer, 订阅的topic: msg_to_modify ctx context.Context
cancel context.CancelFunc
} }
func StartTransfer(prometheusPort int) error { func StartTransfer(prometheusPort int) error {
@ -65,10 +63,6 @@ func StartTransfer(prometheusPort int) error {
return err return err
} }
client, err := kdisc.NewDiscoveryRegister(config.Config.Envs.Discovery) client, err := kdisc.NewDiscoveryRegister(config.Config.Envs.Discovery)
/*
client, err := openkeeper.NewClient(config.Config.Zookeeper.ZkAddr, config.Config.Zookeeper.Schema,
openkeeper.WithFreq(time.Hour), openkeeper.WithRoundRobin(), openkeeper.WithUserNameAndPassword(config.Config.Zookeeper.Username,
config.Config.Zookeeper.Password), openkeeper.WithTimeout(10), openkeeper.WithLogger(log.NewZkLogger()))*/
if err != nil { if err != nil {
return err return err
} }
@ -109,27 +103,22 @@ func NewMsgTransfer(msgDatabase controller.CommonMsgDatabase, conversationRpcCli
} }
func (m *MsgTransfer) Start(prometheusPort int) error { func (m *MsgTransfer) Start(prometheusPort int) error {
ctx := context.Background()
fmt.Println("start msg transfer", "prometheusPort:", prometheusPort) fmt.Println("start msg transfer", "prometheusPort:", prometheusPort)
if prometheusPort <= 0 { if prometheusPort <= 0 {
return errs.Wrap(errors.New("prometheusPort not correct")) return errs.Wrap(errors.New("prometheusPort not correct"))
} }
m.ctx, m.cancel = context.WithCancel(context.Background())
var wg sync.WaitGroup var (
netDone = make(chan struct{}, 1)
netErr error
)
wg.Add(1) onError := func(ctx context.Context, err error, errInfo string) {
go func() { log.ZWarn(ctx, errInfo, err)
defer wg.Done() }
go m.historyCH.historyConsumerGroup.RegisterHandleAndConsumer(m.ctx, m.historyCH, onError)
m.historyCH.historyConsumerGroup.RegisterHandleAndConsumer(ctx, m.historyCH) go m.historyMongoCH.historyConsumerGroup.RegisterHandleAndConsumer(m.ctx, m.historyMongoCH, onError)
}()
wg.Add(1)
go func() {
defer wg.Done()
m.historyMongoCH.historyConsumerGroup.RegisterHandleAndConsumer(ctx, m.historyMongoCH)
}()
if config.Config.Prometheus.Enable { if config.Config.Prometheus.Enable {
go func() { go func() {
@ -141,30 +130,28 @@ func (m *MsgTransfer) Start(prometheusPort int) error {
http.Handle("/metrics", promhttp.HandlerFor(proreg, promhttp.HandlerOpts{Registry: proreg})) http.Handle("/metrics", promhttp.HandlerFor(proreg, promhttp.HandlerOpts{Registry: proreg}))
err := http.ListenAndServe(fmt.Sprintf(":%d", prometheusPort), nil) err := http.ListenAndServe(fmt.Sprintf(":%d", prometheusPort), nil)
if err != nil && err != http.ErrServerClosed { if err != nil && err != http.ErrServerClosed {
panic(err) netErr = errs.Wrap(err, fmt.Sprintf("prometheus start err: %d", prometheusPort))
netDone <- struct{}{}
} }
}() }()
} }
sigs := make(chan os.Signal, 1) sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT) signal.Notify(sigs, syscall.SIGTERM)
<-sigs
// graceful close kafka client.
go m.historyCH.historyConsumerGroup.Close()
go m.historyMongoCH.historyConsumerGroup.Close()
done := make(chan struct{}, 1)
go func() {
wg.Wait()
close(done)
}()
select { select {
case <-done: case <-sigs:
log.ZInfo(context.Background(), "msgtrasfer exit successfully") util.SIGUSR1Exit()
case <-time.After(15 * time.Second): // graceful close kafka client.
log.ZError(context.Background(), "msgtransfer force to exit, timeout 15s", nil) m.cancel()
m.historyCH.historyConsumerGroup.Close()
m.historyMongoCH.historyConsumerGroup.Close()
case <-netDone:
m.cancel()
m.historyCH.historyConsumerGroup.Close()
m.historyMongoCH.historyConsumerGroup.Close()
close(netDone)
return netErr
} }
return nil return nil

2
internal/push/callback.go
Unescape View File

@ -130,7 +130,7 @@ func callbackBeforeSuperGroupOnlinePush(
if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, req, resp, config.Config.Callback.CallbackBeforeSuperGroupOnlinePush); err != nil { if err := http.CallBackPostReturn(ctx, config.Config.Callback.CallbackUrl, req, resp, config.Config.Callback.CallbackBeforeSuperGroupOnlinePush); err != nil {
return err return err
} }
return nil
if len(resp.UserIDs) != 0 { if len(resp.UserIDs) != 0 {
*pushToUserIDs = resp.UserIDs *pushToUserIDs = resp.UserIDs
} }

10
internal/push/consumer_init.go
Unescape View File

@ -14,7 +14,10 @@
package push package push
import "context" import (
"context"
"github.com/OpenIMSDK/tools/log"
)
type Consumer struct { type Consumer struct {
pushCh ConsumerHandler pushCh ConsumerHandler
@ -32,6 +35,9 @@ func NewConsumer(pusher *Pusher) (*Consumer, error) {
} }
func (c *Consumer) Start() { func (c *Consumer) Start() {
onError := func(ctx context.Context, err error, errInfo string) {
log.ZWarn(ctx, errInfo, err)
}
go c.pushCh.pushConsumerGroup.RegisterHandleAndConsumer(context.Background(), &c.pushCh, onError)
go c.pushCh.pushConsumerGroup.RegisterHandleAndConsumer(context.Background(), &c.pushCh)
} }

23
internal/push/push_rpc_server.go
Unescape View File

@ -16,8 +16,6 @@ package push
import ( import (
"context" "context"
"sync"
"github.com/OpenIMSDK/tools/utils" "github.com/OpenIMSDK/tools/utils"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -58,23 +56,18 @@ func Start(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) e
&groupRpcClient, &groupRpcClient,
&msgRpcClient, &msgRpcClient,
) )
var wg sync.WaitGroup
wg.Add(2) pbpush.RegisterPushMsgServiceServer(server, &pushServer{
go func() { pusher: pusher,
defer wg.Done() })
pbpush.RegisterPushMsgServiceServer(server, &pushServer{
pusher: pusher,
})
}()
consumer, err := NewConsumer(pusher) consumer, err := NewConsumer(pusher)
if err != nil { if err != nil {
return err return err
} }
go func() {
defer wg.Done() consumer.Start()
consumer.Start()
}()
wg.Wait()
return nil return nil
} }

2
internal/tools/cron_task.go
Unescape View File

@ -64,7 +64,7 @@ func StartTask() error {
crontab.Start() crontab.Start()
sigs := make(chan os.Signal, 1) sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT) signal.Notify(sigs, syscall.SIGTERM)
<-sigs <-sigs
// stop crontab, Wait for the running task to exit. // stop crontab, Wait for the running task to exit.

22
pkg/common/ginprometheus/ginprometheus.go
Unescape View File

@ -197,30 +197,32 @@ func (p *Prometheus) SetListenAddressWithRouter(listenAddress string, r *gin.Eng
} }
// SetMetricsPath set metrics paths. // SetMetricsPath set metrics paths.
func (p *Prometheus) SetMetricsPath(e *gin.Engine) { func (p *Prometheus) SetMetricsPath(e *gin.Engine) error {
if p.listenAddress != "" { if p.listenAddress != "" {
p.router.GET(p.MetricsPath, prometheusHandler()) p.router.GET(p.MetricsPath, prometheusHandler())
p.runServer() return p.runServer()
} else { } else {
e.GET(p.MetricsPath, prometheusHandler()) e.GET(p.MetricsPath, prometheusHandler())
return nil
} }
} }
// SetMetricsPathWithAuth set metrics paths with authentication. // SetMetricsPathWithAuth set metrics paths with authentication.
func (p *Prometheus) SetMetricsPathWithAuth(e *gin.Engine, accounts gin.Accounts) { func (p *Prometheus) SetMetricsPathWithAuth(e *gin.Engine, accounts gin.Accounts) error {
if p.listenAddress != "" { if p.listenAddress != "" {
p.router.GET(p.MetricsPath, gin.BasicAuth(accounts), prometheusHandler()) p.router.GET(p.MetricsPath, gin.BasicAuth(accounts), prometheusHandler())
p.runServer() return p.runServer()
} else { } else {
e.GET(p.MetricsPath, gin.BasicAuth(accounts), prometheusHandler()) e.GET(p.MetricsPath, gin.BasicAuth(accounts), prometheusHandler())
return nil
} }
} }
func (p *Prometheus) runServer() { func (p *Prometheus) runServer() error {
go p.router.Run(p.listenAddress) return p.router.Run(p.listenAddress)
} }
func (p *Prometheus) getMetrics() []byte { func (p *Prometheus) getMetrics() []byte {
@ -366,15 +368,15 @@ func (p *Prometheus) registerMetrics(subsystem string) {
} }
// Use adds the middleware to a gin engine. // Use adds the middleware to a gin engine.
func (p *Prometheus) Use(e *gin.Engine) { func (p *Prometheus) Use(e *gin.Engine) error {
e.Use(p.HandlerFunc()) e.Use(p.HandlerFunc())
p.SetMetricsPath(e) return p.SetMetricsPath(e)
} }
// UseWithAuth adds the middleware to a gin engine with BasicAuth. // UseWithAuth adds the middleware to a gin engine with BasicAuth.
func (p *Prometheus) UseWithAuth(e *gin.Engine, accounts gin.Accounts) { func (p *Prometheus) UseWithAuth(e *gin.Engine, accounts gin.Accounts) error {
e.Use(p.HandlerFunc()) e.Use(p.HandlerFunc())
p.SetMetricsPathWithAuth(e, accounts) return p.SetMetricsPathWithAuth(e, accounts)
} }
// HandlerFunc defines handler function for middleware. // HandlerFunc defines handler function for middleware.

31
pkg/common/kafka/consumer_group.go
Unescape View File

@ -17,19 +17,16 @@ package kafka
import ( import (
"context" "context"
"errors" "errors"
"strings" "fmt"
"github.com/IBM/sarama" "github.com/IBM/sarama"
"github.com/OpenIMSDK/tools/errs" "github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/log"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"strings"
) )
type MConsumerGroup struct { type MConsumerGroup struct {
ctx context.Context
cancel context.CancelFunc
sarama.ConsumerGroup sarama.ConsumerGroup
groupID string groupID string
topics []string topics []string
@ -57,9 +54,7 @@ func NewMConsumerGroup(consumerConfig *MConsumerGroupConfig, topics, addrs []str
return nil, errs.Wrap(err, strings.Join(topics, ","), strings.Join(addrs, ","), groupID, config.Config.Kafka.Username, config.Config.Kafka.Password) return nil, errs.Wrap(err, strings.Join(topics, ","), strings.Join(addrs, ","), groupID, config.Config.Kafka.Username, config.Config.Kafka.Password)
} }
ctx, cancel := context.WithCancel(context.Background())
return &MConsumerGroup{ return &MConsumerGroup{
ctx, cancel,
consumerGroup, consumerGroup,
groupID, groupID,
topics, topics,
@ -70,27 +65,21 @@ func (mc *MConsumerGroup) GetContextFromMsg(cMsg *sarama.ConsumerMessage) contex
return GetContextWithMQHeader(cMsg.Headers) return GetContextWithMQHeader(cMsg.Headers)
} }
func (mc *MConsumerGroup) RegisterHandleAndConsumer(ctx context.Context, handler sarama.ConsumerGroupHandler) { func (mc *MConsumerGroup) RegisterHandleAndConsumer(ctx context.Context, handler sarama.ConsumerGroupHandler, onError func(context.Context, error, string)) {
log.ZDebug(context.Background(), "register consumer group", "groupID", mc.groupID) log.ZDebug(ctx, "register consumer group", "groupID", mc.groupID)
for { for {
err := mc.ConsumerGroup.Consume(mc.ctx, mc.topics, handler) err := mc.ConsumerGroup.Consume(ctx, mc.topics, handler)
if errors.Is(err, sarama.ErrClosedConsumerGroup) { if errors.Is(err, sarama.ErrClosedConsumerGroup) || errors.Is(err, context.Canceled) {
return return
} }
if mc.ctx.Err() != nil {
return
}
if err != nil { if err != nil {
log.ZWarn(ctx, "consume err", err, "topic", mc.topics, "groupID", mc.groupID) errInfo := fmt.Sprintf("consume err: %v, topic: %v, groupID: %s", err, strings.Join(mc.topics, ", "), mc.groupID)
} onError(ctx, err, errInfo) // 调用回调函数处理错误
if ctx.Err() != nil {
return return
} }
} }
} }
func (mc *MConsumerGroup) Close() { func (mc *MConsumerGroup) Close() error {
mc.cancel() return mc.ConsumerGroup.Close()
mc.ConsumerGroup.Close()
} }

88
pkg/common/startrpc/start.go
Unescape View File

@ -15,8 +15,11 @@
package startrpc package startrpc
import ( import (
"context"
"errors" "errors"
"fmt" "fmt"
"github.com/OpenIMSDK/tools/errs"
util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
"net" "net"
"net/http" "net/http"
"os" "os"
@ -26,14 +29,10 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/OpenIMSDK/tools/errs"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"golang.org/x/sync/errgroup"
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics" "github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -56,12 +55,13 @@ func Start(
) error { ) error {
fmt.Printf("start %s server, port: %d, prometheusPort: %d, OpenIM version: %s\n", fmt.Printf("start %s server, port: %d, prometheusPort: %d, OpenIM version: %s\n",
rpcRegisterName, rpcPort, prometheusPort, config.Version) rpcRegisterName, rpcPort, prometheusPort, config.Version)
rpcTcpAddr := net.JoinHostPort(network.GetListenIP(config.Config.Rpc.ListenIP), strconv.Itoa(rpcPort))
listener, err := net.Listen( listener, err := net.Listen(
"tcp", "tcp",
net.JoinHostPort(network.GetListenIP(config.Config.Rpc.ListenIP), strconv.Itoa(rpcPort)), rpcTcpAddr,
) )
if err != nil { if err != nil {
return errs.Wrap(err, network.GetListenIP(config.Config.Rpc.ListenIP), strconv.Itoa(rpcPort)) return errs.Wrap(err, "rpc start err", rpcTcpAddr)
} }
defer listener.Close() defer listener.Close()
@ -108,46 +108,64 @@ func Start(
return errs.Wrap(err) return errs.Wrap(err)
} }
var wg errgroup.Group var (
netDone = make(chan struct{}, 2)
wg.Go(func() error { netErr error
httpServer *http.Server
)
go func() {
if config.Config.Prometheus.Enable && prometheusPort != 0 { if config.Config.Prometheus.Enable && prometheusPort != 0 {
metric.InitializeMetrics(srv) metric.InitializeMetrics(srv)
// Create a HTTP server for prometheus. // Create a HTTP server for prometheus.
httpServer := &http.Server{Handler: promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), Addr: fmt.Sprintf("0.0.0.0:%d", prometheusPort)} httpServer = &http.Server{Handler: promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), Addr: fmt.Sprintf("0.0.0.0:%d", prometheusPort)}
if err := httpServer.ListenAndServe(); err != nil { if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v PrometheusPort: %d \n\n", err, prometheusPort) netErr = errs.Wrap(err, "prometheus start err", httpServer.Addr)
os.Exit(-1) netDone <- struct{}{}
} }
} }
return nil }()
})
wg.Go(func() error { go func() {
return errs.Wrap(srv.Serve(listener)) err := srv.Serve(listener)
}) if err != nil {
netErr = errs.Wrap(err, "rpc start err: ", rpcTcpAddr)
netDone <- struct{}{}
}
}()
sigs := make(chan os.Signal, 1) sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT) signal.Notify(sigs, syscall.SIGTERM)
<-sigs select {
case <-sigs:
var ( util.SIGUSR1Exit()
done = make(chan struct{}, 1) ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
gerr error defer cancel()
) if err := gracefulStopWithCtx(ctx, srv.GracefulStop); err != nil {
return err
}
ctx, cancel = context.WithTimeout(context.Background(), 15*time.Second)
defer cancel()
err := httpServer.Shutdown(ctx)
if err != nil {
return errs.Wrap(err, "shutdown err")
}
return errors.New("SIGTERM EXIT")
case <-netDone:
close(netDone)
return netErr
}
}
func gracefulStopWithCtx(ctx context.Context, f func()) error {
done := make(chan struct{}, 1)
go func() { go func() {
once.Do(srv.GracefulStop) f()
gerr = wg.Wait()
close(done) close(done)
}() }()
select { select {
case <-ctx.Done():
return errs.Wrap(errors.New("timeout, ctx graceful stop"))
case <-done: case <-done:
return gerr return nil
case <-time.After(15 * time.Second):
return errs.Wrap(errors.New("timeout exit"))
} }
} }

15
pkg/util/genutil/genutil.go
Unescape View File

@ -15,6 +15,7 @@
package genutil package genutil
import ( import (
"errors"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
@ -39,3 +40,17 @@ func OutDir(path string) (string, error) {
outDir += "/" outDir += "/"
return outDir, nil return outDir, nil
} }
func ExitWithError(err error) {
if errors.Is(err, errors.New("SIGTERM EXIT")) {
os.Exit(-1)
}
progName := filepath.Base(os.Args[0])
fmt.Fprintf(os.Stderr, "\n\n%s exit -1: \n%+v\n\n", progName, err)
os.Exit(-1)
}
func SIGUSR1Exit() {
progName := filepath.Base(os.Args[0])
fmt.Printf("\n\n%s receive process terminal SIGTERM exit 0\n\n", progName)
}

2
scripts/githooks/pre-commit.sh
Unescape View File

@ -105,7 +105,7 @@ fi
if [[ ! $local_branch =~ $valid_branch_regex ]] if [[ ! $local_branch =~ $valid_branch_regex ]]
then then
printError "There is something wrong with your branch name. Branch names in this project must adhere to this contract: $valid_branch_regex. printError "There is something wrong with your branch name. Branch names in this project must adhere to this contract: $valid_branch_regex.
Your commit will be rejected. You should rename your branch to a valid name(feat/name OR bug/name) and try again." Your commit will be rejected. You should rename your branch to a valid name(feat/name OR fix/name) and try again."
printError "For more on this, read on: https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694" printError "For more on this, read on: https://gist.github.com/cubxxw/126b72104ac0b0ca484c9db09c3e5694"
exit 1 exit 1
fi fi

2
scripts/install/openim-push.sh
Unescape View File

@ -73,7 +73,7 @@ function openim::push::start() {
for (( i=0; i<${#OPENIM_PUSH_PORTS_ARRAY[@]}; i++ )); do for (( i=0; i<${#OPENIM_PUSH_PORTS_ARRAY[@]}; i++ )); do
openim::log::info "start push process, port: ${OPENIM_PUSH_PORTS_ARRAY[$i]}, prometheus port: ${PUSH_PROM_PORTS_ARRAY[$i]}" openim::log::info "start push process, port: ${OPENIM_PUSH_PORTS_ARRAY[$i]}, prometheus port: ${PUSH_PROM_PORTS_ARRAY[$i]}"
nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} -c ${OPENIM_PUSH_CONFIG} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) & nohup ${OPENIM_PUSH_BINARY} --port ${OPENIM_PUSH_PORTS_ARRAY[$i]} -c ${OPENIM_PUSH_CONFIG} --prometheus_port ${PUSH_PROM_PORTS_ARRAY[$i]} >> ${LOG_FILE} 2> >(tee -a "${STDERR_LOG_FILE}" "$TMP_LOG_FILE" >&2) &
done done
openim::util::check_process_names ${SERVER_NAME} openim::util::check_process_names ${SERVER_NAME}

4
scripts/lib/util.sh
Unescape View File

@ -486,7 +486,7 @@ openim::util::stop_services_on_ports() {
local pid=$(echo $line | awk '{print $2}') local pid=$(echo $line | awk '{print $2}')
# Try to stop the service by killing its process. # Try to stop the service by killing its process.
if kill -10 $pid; then if kill -15 $pid; then
stopped+=($port) stopped+=($port)
else else
not_stopped+=($port) not_stopped+=($port)
@ -561,7 +561,7 @@ openim::util::stop_services_with_name() {
# If there's a Process ID, it means the service with the name is running. # If there's a Process ID, it means the service with the name is running.
if [[ -n $pid ]]; then if [[ -n $pid ]]; then
# Try to stop the service by killing its process. # Try to stop the service by killing its process.
if kill -10 $pid 2>/dev/null; then if kill -15 $pid 2>/dev/null; then
stopped_this_time=true stopped_this_time=true
fi fi
fi fi

Write Preview
Loading…
Cancel
Save