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

script

Browse Source
This commit is contained in:
wangchuxiao 2023-03-09 14:59:45 +08:00
parent 82f499f942
commit ae2e09e48b
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/push/main.go
View File

@ -1,7 +1,9 @@
package main package main
import ( import (
"OpenIM/internal/push"
"OpenIM/pkg/common/cmd" "OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt" "fmt"
"os" "os"
) )
@ -10,8 +12,11 @@ func main() {
pushCmd := cmd.NewPushCmd() pushCmd := cmd.NewPushCmd()
pushCmd.AddPortFlag() pushCmd.AddPortFlag()
pushCmd.AddPrometheusPortFlag() pushCmd.AddPrometheusPortFlag()
pushCmd.AddPush() if err := pushCmd.Exec(); err != nil {
if err := pushCmd.Execute(); err != nil { fmt.Println(err.Error())
os.Exit(1)
}
if err := pushCmd.StartSvr(config.Config.RpcRegisterName.OpenImPushName, push.Start); err != nil {
fmt.Println(err.Error()) fmt.Println(err.Error())
os.Exit(1) os.Exit(1)
} }

8
internal/startrpc/start.go
View File

@ -16,7 +16,7 @@ import (
"net" "net"
) )
func start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, options []grpc.ServerOption) error { func Start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, options ...grpc.ServerOption) error {
fmt.Println("start", rpcRegisterName, "rpc server, port: ", rpcPort, "prometheusPort:", prometheusPort, ", OpenIM version: ", config.Version) fmt.Println("start", rpcRegisterName, "rpc server, port: ", rpcPort, "prometheusPort:", prometheusPort, ", OpenIM version: ", config.Version)
log.NewPrivateLog(constant.LogFileName) log.NewPrivateLog(constant.LogFileName)
listener, err := net.Listen("tcp", fmt.Sprintf("%s:%d", config.Config.ListenIP, rpcPort)) listener, err := net.Listen("tcp", fmt.Sprintf("%s:%d", config.Config.ListenIP, rpcPort))
@ -60,6 +60,6 @@ func start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(c
return rpcFn(zkClient, srv) return rpcFn(zkClient, srv)
} }
func Start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, options ...grpc.ServerOption) error { //func Start(rpcPort int, rpcRegisterName string, prometheusPort int, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, options ...grpc.ServerOption) error {
return start(rpcPort, rpcRegisterName, prometheusPort, rpcFn, options) // return start(rpcPort, rpcRegisterName, prometheusPort, rpcFn, options)
} //}

13
pkg/common/cmd/push.go
View File

@ -1,10 +1,9 @@
package cmd package cmd
import ( import (
"OpenIM/internal/push"
"OpenIM/internal/startrpc" "OpenIM/internal/startrpc"
"OpenIM/pkg/common/config" "OpenIM/pkg/discoveryregistry"
"github.com/spf13/cobra" "google.golang.org/grpc"
) )
type PushCmd struct { type PushCmd struct {
@ -12,11 +11,9 @@ type PushCmd struct {
} }
func NewPushCmd() *PushCmd { func NewPushCmd() *PushCmd {
return &PushCmd{NewAuthCmd()} return &PushCmd{NewRpcCmd()}
} }
func (r *PushCmd) AddPush() { func (r *PushCmd) StartSvr(name string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error {
r.Command.RunE = func(cmd *cobra.Command, args []string) error { return startrpc.Start(r.GetPortFlag(), name, r.GetPrometheusPortFlag(), rpcFn)
return startrpc.Start(r.getPortFlag(cmd), config.Config.RpcRegisterName.OpenImPushName, r.getPrometheusPortFlag(cmd), push.Start)
}
} }