coopgo-platform/gorush
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

refactor: create logx package (#584)

Browse Source
This commit is contained in:
Bo-Yi Wu
2021-07-13 16:32:39 +08:00
committed by GitHub
parent bcb9a33d43
commit 35e1998cc5
25 changed files with 343 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rpc/server.go
View File

@@ -6,7 +6,9 @@ import (
"strings"
"sync"
"github.com/appleboy/gorush/core"
"github.com/appleboy/gorush/gorush"
"github.com/appleboy/gorush/logx"
"github.com/appleboy/gorush/rpc/proto"
"google.golang.org/grpc"
@@ -70,7 +72,7 @@ func (s *Server) Send(ctx context.Context, in *proto.NotificationRequest) (*prot
notification.Badge = &badge
}
if in.Topic != "" && in.Platform == gorush.PlatFormAndroid {
if in.Topic != "" && in.Platform == core.PlatFormAndroid {
notification.To = in.Topic
}
@@ -107,7 +109,7 @@ func (s *Server) Send(ctx context.Context, in *proto.NotificationRequest) (*prot
// RunGRPCServer run gorush grpc server
func RunGRPCServer(ctx context.Context) error {
if !gorush.PushConf.GRPC.Enabled {
gorush.LogAccess.Info("gRPC server is disabled.")
logx.LogAccess.Info("gRPC server is disabled.")
return nil
}
@@ -121,19 +123,19 @@ func RunGRPCServer(ctx context.Context) error {
lis, err := net.Listen("tcp", ":"+gorush.PushConf.GRPC.Port)
if err != nil {
gorush.LogError.Fatalln(err)
logx.LogError.Fatalln(err)
return err
}
gorush.LogAccess.Info("gRPC server is running on " + gorush.PushConf.GRPC.Port + " port.")
logx.LogAccess.Info("gRPC server is running on " + gorush.PushConf.GRPC.Port + " port.")
go func() {
select {
case <-ctx.Done():
s.GracefulStop() // graceful shutdown
gorush.LogAccess.Info("shutdown the gRPC server")
logx.LogAccess.Info("shutdown the gRPC server")
}
}()
if err = s.Serve(lis); err != nil {
gorush.LogError.Fatalln(err)
logx.LogError.Fatalln(err)
}
return err
}

8
rpc/server_test.go
View File

@@ -5,6 +5,7 @@ import (
"testing"
"github.com/appleboy/gorush/gorush"
"github.com/appleboy/gorush/logx"
"google.golang.org/grpc"
"google.golang.org/grpc/connectivity"
@@ -14,7 +15,12 @@ const gRPCAddr = "localhost:9000"
func TestGracefulShutDownGRPCServer(t *testing.T) {
// server configs
gorush.InitLog()
logx.InitLog(
gorush.PushConf.Log.AccessLevel,
gorush.PushConf.Log.AccessLog,
gorush.PushConf.Log.ErrorLevel,
gorush.PushConf.Log.ErrorLog,
)
gorush.PushConf.GRPC.Enabled = true
gorush.PushConf.GRPC.Port = "9000"
gorush.PushConf.Log.Format = "json"