This commit is contained in:
wangchuxiao 2023-03-09 11:16:01 +08:00
parent 2bc2b4cf24
commit 4c25686060

View File

@ -2,7 +2,6 @@ package cmd
import ( import (
"OpenIM/internal/startrpc" "OpenIM/internal/startrpc"
"OpenIM/pkg/common/config"
"OpenIM/pkg/discoveryregistry" "OpenIM/pkg/discoveryregistry"
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -20,12 +19,14 @@ func NewRpcCmd(rpcRegisterName string) *RpcCmd {
func (r *RpcCmd) AddRpc(rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) { func (r *RpcCmd) AddRpc(rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) {
r.Command.RunE = func(cmd *cobra.Command, args []string) error { r.Command.RunE = func(cmd *cobra.Command, args []string) error {
fmt.Println(r.getPortFlag(cmd), r.rpcRegisterName, r.getPrometheusPortFlag(cmd), config.Config.RpcRegisterName)
return startrpc.Start(r.getPortFlag(cmd), r.rpcRegisterName, r.getPrometheusPortFlag(cmd), rpcFn) return startrpc.Start(r.getPortFlag(cmd), r.rpcRegisterName, r.getPrometheusPortFlag(cmd), rpcFn)
} }
} }
func (r *RpcCmd) Exec(rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error { func (r *RpcCmd) Exec(rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error {
fmt.Println(r)
r.AddRpc(rpcFn) r.AddRpc(rpcFn)
fmt.Println(r)
return r.Execute() return r.Execute()
} }