From ae2e09e48b74b33cf527573c7a2233dbd3341e52 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Thu, 9 Mar 2023 14:59:45 +0800
Subject: [PATCH] script

---
 cmd/push/main.go           |  9 +++++++--
 internal/startrpc/start.go |  8 ++++----
 pkg/common/cmd/push.go     | 13 +++++--------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/cmd/push/main.go b/cmd/push/main.go
index 6a39c283a..2e46382d0 100644
--- a/cmd/push/main.go
+++ b/cmd/push/main.go
@@ -1,7 +1,9 @@
 package main
 
 import (
+	"OpenIM/internal/push"
 	"OpenIM/pkg/common/cmd"
+	"OpenIM/pkg/common/config"
 	"fmt"
 	"os"
 )
@@ -10,8 +12,11 @@ func main() {
 	pushCmd := cmd.NewPushCmd()
 	pushCmd.AddPortFlag()
 	pushCmd.AddPrometheusPortFlag()
-	pushCmd.AddPush()
-	if err := pushCmd.Execute(); err != nil {
+	if err := pushCmd.Exec(); 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())
 		os.Exit(1)
 	}
diff --git a/internal/startrpc/start.go b/internal/startrpc/start.go
index c65ec398f..fcf48bf0d 100644
--- a/internal/startrpc/start.go
+++ b/internal/startrpc/start.go
@@ -16,7 +16,7 @@ import (
 	"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)
 	log.NewPrivateLog(constant.LogFileName)
 	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)
 }
 
-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)
-}
+//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)
+//}
diff --git a/pkg/common/cmd/push.go b/pkg/common/cmd/push.go
index 372be53a5..498492fb8 100644
--- a/pkg/common/cmd/push.go
+++ b/pkg/common/cmd/push.go
@@ -1,10 +1,9 @@
 package cmd
 
 import (
-	"OpenIM/internal/push"
 	"OpenIM/internal/startrpc"
-	"OpenIM/pkg/common/config"
-	"github.com/spf13/cobra"
+	"OpenIM/pkg/discoveryregistry"
+	"google.golang.org/grpc"
 )
 
 type PushCmd struct {
@@ -12,11 +11,9 @@ type PushCmd struct {
 }
 
 func NewPushCmd() *PushCmd {
-	return &PushCmd{NewAuthCmd()}
+	return &PushCmd{NewRpcCmd()}
 }
 
-func (r *PushCmd) AddPush() {
-	r.Command.RunE = func(cmd *cobra.Command, args []string) error {
-		return startrpc.Start(r.getPortFlag(cmd), config.Config.RpcRegisterName.OpenImPushName, r.getPrometheusPortFlag(cmd), push.Start)
-	}
+func (r *PushCmd) StartSvr(name string, rpcFn func(client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error) error {
+	return startrpc.Start(r.GetPortFlag(), name, r.GetPrometheusPortFlag(), rpcFn)
 }