blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-11-05 11:52:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.6.1-code-conventions' into 3.6.1-code-conventions

Browse Source
This commit is contained in:
Gordon 2024-03-19 18:50:03 +08:00
commit f10dd554f5
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/common/db/cache/msg.go vendored
View File

@ -22,6 +22,7 @@ import (
"github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/constant"
"github.com/OpenIMSDK/protocol/sdkws" "github.com/OpenIMSDK/protocol/sdkws"
"github.com/go-redis/redis"
"github.com/gogo/protobuf/jsonpb" "github.com/gogo/protobuf/jsonpb"
"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/msgprocessor" "github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"

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

@ -18,7 +18,6 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/openimsdk/tools/log"
"net" "net"
"net/http" "net/http"
"os" "os"
@ -28,6 +27,8 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/openimsdk/tools/log"
grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
"github.com/openimsdk/tools/discoveryregistry" "github.com/openimsdk/tools/discoveryregistry"
"github.com/openimsdk/tools/errs" "github.com/openimsdk/tools/errs"
@ -46,15 +47,7 @@ import (
) )
// Start rpc server. // Start rpc server.
func Start( func Start(ctx context.Context, rpcPort int, rpcRegisterName string, prometheusPort int, config *config2.GlobalConfig, rpcFn func(ctx context.Context, config *config.GlobalConfig, client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, options ...grpc.ServerOption) error {
ctx context.Context,
rpcPort int,
rpcRegisterName string,
prometheusPort int,
config *config2.GlobalConfig,
rpcFn func(ctx context.Context, config *config.GlobalConfig, client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error,
options ...grpc.ServerOption,
) error {
log.CInfo(ctx, "rpc server starting", "rpcRegisterName", rpcRegisterName, "rpcPort", rpcPort, log.CInfo(ctx, "rpc server starting", "rpcRegisterName", rpcRegisterName, "rpcPort", rpcPort,
"prometheusPort", prometheusPort) "prometheusPort", prometheusPort)
rpcTcpAddr := net.JoinHostPort(network.GetListenIP(config.Rpc.ListenIP), strconv.Itoa(rpcPort)) rpcTcpAddr := net.JoinHostPort(network.GetListenIP(config.Rpc.ListenIP), strconv.Itoa(rpcPort))
@ -63,7 +56,7 @@ func Start(
rpcTcpAddr, rpcTcpAddr,
) )
if err != nil { if err != nil {
return errs.WrapMsg(err, "listen err", rpcTcpAddr) return errs.WrapMsg(err, "listen err", "rpcTcpAddr", rpcTcpAddr)
} }
defer listener.Close() defer listener.Close()
@ -76,7 +69,7 @@ func Start(
client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin"))) client.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"LoadBalancingPolicy": "%s"}`, "round_robin")))
registerIP, err := network.GetRpcRegisterIP(config.Rpc.RegisterIP) registerIP, err := network.GetRpcRegisterIP(config.Rpc.RegisterIP)
if err != nil { if err != nil {
return errs.Wrap(err) return err
} }
var reg *prometheus.Registry var reg *prometheus.Registry
@ -100,6 +93,7 @@ func Start(
if err != nil { if err != nil {
return err return err
} }
err = client.Register( err = client.Register(
rpcRegisterName, rpcRegisterName,
registerIP, registerIP,
@ -107,7 +101,7 @@ func Start(
grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithTransportCredentials(insecure.NewCredentials()),
) )
if err != nil { if err != nil {
return errs.Wrap(err) return err
} }
var ( var (
@ -115,6 +109,7 @@ func Start(
netErr error netErr error
httpServer *http.Server httpServer *http.Server
) )
go func() { go func() {
if config.Prometheus.Enable && prometheusPort != 0 { if config.Prometheus.Enable && prometheusPort != 0 {
metric.InitializeMetrics(srv) metric.InitializeMetrics(srv)