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

refactor: unified naming for module startup functions.

Browse Source
This commit is contained in:
Gordon 2024-03-18 16:34:03 +08:00
parent 1ebd4aa0d9
commit 269794456a
11 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/openim-api/main.go
View File

@ -22,7 +22,7 @@ import (
) )
func main() { func main() {
apiCmd := cmd.NewApiCmd() apiCmd := cmd.NewApiCmd(cmd.ApiServer)
apiCmd.AddPortFlag() apiCmd.AddPortFlag()
apiCmd.AddPrometheusPortFlag() apiCmd.AddPrometheusPortFlag()
if err := apiCmd.Execute(); err != nil { if err := apiCmd.Execute(); err != nil {

2
cmd/openim-crontask/main.go
View File

@ -20,7 +20,7 @@ import (
) )
func main() { func main() {
cronTaskCmd := cmd.NewCronTaskCmd() cronTaskCmd := cmd.NewCronTaskCmd(cmd.CronTaskServer)
if err := cronTaskCmd.Exec(); err != nil { if err := cronTaskCmd.Exec(); err != nil {
util.ExitWithError(err) util.ExitWithError(err)
} }

2
cmd/openim-msggateway/main.go
View File

@ -20,7 +20,7 @@ import (
) )
func main() { func main() {
msgGatewayCmd := cmd.NewMsgGatewayCmd() msgGatewayCmd := cmd.NewMsgGatewayCmd(cmd.MsgGatewayServer)
msgGatewayCmd.AddWsPortFlag() msgGatewayCmd.AddWsPortFlag()
msgGatewayCmd.AddPortFlag() msgGatewayCmd.AddPortFlag()
msgGatewayCmd.AddPrometheusPortFlag() msgGatewayCmd.AddPrometheusPortFlag()

2
cmd/openim-msgtransfer/main.go
View File

@ -20,7 +20,7 @@ import (
) )
func main() { func main() {
msgTransferCmd := cmd.NewMsgTransferCmd() msgTransferCmd := cmd.NewMsgTransferCmd(cmd.MsgTransferServer)
msgTransferCmd.AddPrometheusPortFlag() msgTransferCmd.AddPrometheusPortFlag()
msgTransferCmd.AddTransferProgressFlag() msgTransferCmd.AddTransferProgressFlag()
if err := msgTransferCmd.Exec(); err != nil { if err := msgTransferCmd.Exec(); err != nil {

4
internal/msggateway/init.go
View File

@ -21,8 +21,8 @@ import (
"github.com/openimsdk/open-im-server/v3/pkg/common/config" "github.com/openimsdk/open-im-server/v3/pkg/common/config"
) )
// RunWsAndServer run ws server. // Start run ws server.
func RunWsAndServer(conf *config.GlobalConfig, rpcPort, wsPort, prometheusPort int) error { func Start(conf *config.GlobalConfig, rpcPort, wsPort, prometheusPort int) error {
fmt.Println("start rpc/msg_gateway server, port: ", rpcPort, wsPort, prometheusPort, ", OpenIM version: ", config.Version) fmt.Println("start rpc/msg_gateway server, port: ", rpcPort, wsPort, prometheusPort, ", OpenIM version: ", config.Version)
longServer, err := NewWsServer( longServer, err := NewWsServer(
conf, conf,

2
internal/msgtransfer/init.go
View File

@ -53,7 +53,7 @@ type MsgTransfer struct {
cancel context.CancelFunc cancel context.CancelFunc
} }
func StartTransfer(config *config.GlobalConfig, prometheusPort int) error { func Start(config *config.GlobalConfig, prometheusPort int) error {
rdb, err := cache.NewRedis(&config.Redis) rdb, err := cache.NewRedis(&config.Redis)
if err != nil { if err != nil {
return err return err

8
pkg/common/cmd/api.go
View File

@ -19,16 +19,14 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/openimsdk/open-im-server/v3/internal/api" "github.com/openimsdk/open-im-server/v3/internal/api"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
) )
type ApiCmd struct { type ApiCmd struct {
*RootCmd *RootCmd
initFunc func(config *config.GlobalConfig, port int, promPort int) error
} }
func NewApiCmd() *ApiCmd { func NewApiCmd(name string) *ApiCmd {
ret := &ApiCmd{RootCmd: NewRootCmd("api"), initFunc: api.Start} ret := &ApiCmd{RootCmd: NewRootCmd(name)}
ret.SetRootCmdPt(ret) ret.SetRootCmdPt(ret)
ret.addPreRun() ret.addPreRun()
ret.addRunE() ret.addRunE()
@ -44,7 +42,7 @@ func (a *ApiCmd) addPreRun() {
func (a *ApiCmd) addRunE() { func (a *ApiCmd) addRunE() {
a.Command.RunE = func(cmd *cobra.Command, args []string) error { a.Command.RunE = func(cmd *cobra.Command, args []string) error {
return a.initFunc(a.config, a.port, a.prometheusPort) return api.Start(a.config, a.port, a.prometheusPort)
} }
} }

4
pkg/common/cmd/constant.go
View File

@ -23,4 +23,8 @@ const (
RpcMsgServer = "msg" RpcMsgServer = "msg"
RpcThirdServer = "third" RpcThirdServer = "third"
RpcUserServer = "user" RpcUserServer = "user"
ApiServer = "api"
CronTaskServer = "cronTask"
MsgGatewayServer = "msgGateway"
MsgTransferServer = "msgTransfer"
) )

4
pkg/common/cmd/cron_task.go
View File

@ -26,8 +26,8 @@ type CronTaskCmd struct {
initFunc func(config *config.GlobalConfig) error initFunc func(config *config.GlobalConfig) error
} }
func NewCronTaskCmd() *CronTaskCmd { func NewCronTaskCmd(name string) *CronTaskCmd {
ret := &CronTaskCmd{RootCmd: NewRootCmd("cronTask", WithCronTaskLogName()), ret := &CronTaskCmd{RootCmd: NewRootCmd(name, WithCronTaskLogName()),
initFunc: tools.StartTask} initFunc: tools.StartTask}
ret.addRunE() ret.addRunE()
ret.SetRootCmdPt(ret) ret.SetRootCmdPt(ret)

6
pkg/common/cmd/msg_gateway.go
View File

@ -27,8 +27,8 @@ type MsgGatewayCmd struct {
*RootCmd *RootCmd
} }
func NewMsgGatewayCmd() *MsgGatewayCmd { func NewMsgGatewayCmd(name string) *MsgGatewayCmd {
ret := &MsgGatewayCmd{NewRootCmd("msgGateway")} ret := &MsgGatewayCmd{NewRootCmd(name)}
ret.addRunE() ret.addRunE()
ret.SetRootCmdPt(ret) ret.SetRootCmdPt(ret)
return ret return ret
@ -51,7 +51,7 @@ func (m *MsgGatewayCmd) getWsPortFlag(cmd *cobra.Command) int {
func (m *MsgGatewayCmd) addRunE() { func (m *MsgGatewayCmd) addRunE() {
m.Command.RunE = func(cmd *cobra.Command, args []string) error { m.Command.RunE = func(cmd *cobra.Command, args []string) error {
return msggateway.RunWsAndServer(m.config, m.getPortFlag(cmd), m.getWsPortFlag(cmd), m.getPrometheusPortFlag(cmd)) return msggateway.Start(m.config, m.getPortFlag(cmd), m.getWsPortFlag(cmd), m.getPrometheusPortFlag(cmd))
} }
} }

6
pkg/common/cmd/msg_transfer.go
View File

@ -27,8 +27,8 @@ type MsgTransferCmd struct {
*RootCmd *RootCmd
} }
func NewMsgTransferCmd() *MsgTransferCmd { func NewMsgTransferCmd(name string) *MsgTransferCmd {
ret := &MsgTransferCmd{NewRootCmd("msgTransfer")} ret := &MsgTransferCmd{NewRootCmd(name)}
ret.addRunE() ret.addRunE()
ret.SetRootCmdPt(ret) ret.SetRootCmdPt(ret)
return ret return ret
@ -36,7 +36,7 @@ func NewMsgTransferCmd() *MsgTransferCmd {
func (m *MsgTransferCmd) addRunE() { func (m *MsgTransferCmd) addRunE() {
m.Command.RunE = func(cmd *cobra.Command, args []string) error { m.Command.RunE = func(cmd *cobra.Command, args []string) error {
return msgtransfer.StartTransfer(m.config, m.getPrometheusPortFlag(cmd)) return msgtransfer.Start(m.config, m.getPrometheusPortFlag(cmd))
} }
} }