From 952160e0c9b753482cfd8ffdfdfc2d75d954a9ca Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Tue, 19 Mar 2024 19:57:33 +0800 Subject: [PATCH] refactor: unified naming for module startup functions. --- internal/api/route.go | 2 +- internal/msggateway/init.go | 2 +- internal/msgtransfer/init.go | 8 ++++---- internal/tools/cron_task.go | 2 +- pkg/common/startrpc/start.go | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/api/route.go b/internal/api/route.go index 1165a2dd4..28a9197c9 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -104,7 +104,7 @@ func Start(ctx context.Context, config *config.GlobalConfig, port int, proPort i } server := http.Server{Addr: address, Handler: router} - log.CInfo(ctx, "api server starting", "address", address, "apiPort", port, + log.CInfo(ctx, "API server is initializing", "address", address, "apiPort", port, "prometheusPort", proPort) go func() { err = server.ListenAndServe() diff --git a/internal/msggateway/init.go b/internal/msggateway/init.go index 5ccbbacc9..77d99845a 100644 --- a/internal/msggateway/init.go +++ b/internal/msggateway/init.go @@ -24,7 +24,7 @@ import ( // Start run ws server. func Start(ctx context.Context, conf *config.GlobalConfig, rpcPort, wsPort, prometheusPort int) error { - log.CInfo(ctx, "msg_gateway server starting", "rpcPort", rpcPort, "wsPort", wsPort, + log.CInfo(ctx, "MSG-GATEWAY server is initializing", "rpcPort", rpcPort, "wsPort", wsPort, "prometheusPort", prometheusPort) longServer, err := NewWsServer( conf, diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index 15bee8823..d2157e649 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -54,6 +54,8 @@ type MsgTransfer struct { } func Start(ctx context.Context, config *config.GlobalConfig, prometheusPort, index int) error { + log.CInfo(ctx, "MSG-TRANSFER server is initializing", + "prometheusPort", prometheusPort, "index", index) rdb, err := cache.NewRedis(ctx, &config.Redis) if err != nil { return err @@ -89,7 +91,7 @@ func Start(ctx context.Context, config *config.GlobalConfig, prometheusPort, ind if err != nil { return err } - return msgTransfer.Start(ctx, prometheusPort, config, index) + return msgTransfer.Start(prometheusPort, config, index) } func NewMsgTransfer(kafkaConf *config.Kafka, msgDatabase controller.CommonMsgDatabase, conversationRpcClient *rpcclient.ConversationRpcClient, groupRpcClient *rpcclient.GroupRpcClient) (*MsgTransfer, error) { @@ -108,9 +110,7 @@ func NewMsgTransfer(kafkaConf *config.Kafka, msgDatabase controller.CommonMsgDat }, nil } -func (m *MsgTransfer) Start(ctx context.Context, prometheusPort int, config *config.GlobalConfig, index int) error { - log.CInfo(ctx, "msg_transfer server starting", - "prometheusPort", prometheusPort, "index", index) +func (m *MsgTransfer) Start(prometheusPort int, config *config.GlobalConfig, index int) error { if prometheusPort <= 0 { return errs.WrapMsg(errors.New("invalid prometheus port"), "prometheusPort validation failed", "providedPort", prometheusPort) } diff --git a/internal/tools/cron_task.go b/internal/tools/cron_task.go index f4c19fd74..87ea64534 100644 --- a/internal/tools/cron_task.go +++ b/internal/tools/cron_task.go @@ -31,7 +31,7 @@ import ( func StartTask(ctx context.Context, config *config.GlobalConfig) error { - log.CInfo(ctx, "cron task server starting", "chatRecordsClearTime", config.ChatRecordsClearTime, "msgDestructTime", config.MsgDestructTime) + log.CInfo(ctx, "CRON-TASK server is initializing", "chatRecordsClearTime", config.ChatRecordsClearTime, "msgDestructTime", config.MsgDestructTime) msgTool, err := InitMsgTool(ctx, config) if err != nil { diff --git a/pkg/common/startrpc/start.go b/pkg/common/startrpc/start.go index 15a6d1bcc..b1ee2d2ed 100644 --- a/pkg/common/startrpc/start.go +++ b/pkg/common/startrpc/start.go @@ -48,7 +48,7 @@ import ( // Start rpc server. 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 { - log.CInfo(ctx, "rpc server starting", "rpcRegisterName", rpcRegisterName, "rpcPort", rpcPort, + log.CInfo(ctx, "RPC server is initializing", "rpcRegisterName", rpcRegisterName, "rpcPort", rpcPort, "prometheusPort", prometheusPort) rpcTcpAddr := net.JoinHostPort(network.GetListenIP(config.Rpc.ListenIP), strconv.Itoa(rpcPort)) listener, err := net.Listen(