fix: grpclog data race (#515)

douyu · Oct 26, 2022 · 24a6708 · 24a6708
1 parent 07fb9a5
commit 24a6708
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/client/grpc/client.go b/pkg/client/grpc/client.go
@@ -28,12 +28,6 @@ import (
 
 type ClientConn = grpc.ClientConn
 
-func init() {
-	// conf.OnLoaded(func(c *conf.Configuration) {
-	// xgrpclog.SetLogger(xlog.Jupiter().With(xlog.FieldMod("grpc")))
-	// })
-}
-
 func newGRPCClient(config *Config) *grpc.ClientConn {
 	var ctx = context.Background()
 

diff --git a/pkg/core/application/application.go b/pkg/core/application/application.go
@@ -33,6 +33,7 @@ import (
 	"github.com/douyu/jupiter/pkg/core/executor"
 	"github.com/douyu/jupiter/pkg/core/hooks"
 	"github.com/douyu/jupiter/pkg/core/signals"
+	"github.com/douyu/jupiter/pkg/core/xgrpclog"
 	"github.com/douyu/jupiter/pkg/flag"
 	"github.com/douyu/jupiter/pkg/registry"
 	"github.com/douyu/jupiter/pkg/server"
@@ -109,6 +110,8 @@ func (app *Application) initialize() {
 
 		_ = app.parseFlags()
 		_ = app.printBanner()
+
+		xgrpclog.SetLogger(xlog.Jupiter())
 	})
 }
 

diff --git a/pkg/core/xgrpclog/logger.go b/pkg/core/xgrpclog/logger.go
@@ -8,8 +8,11 @@ import (
 	"google.golang.org/grpc/grpclog"
 )
 
+const defaultCallerSkip = 4
+
 // SetLogger sets loggerWrapper to grpclog
 func SetLogger(logger *xlog.Logger) {
+	logger = logger.WithOptions(zap.AddCallerSkip(defaultCallerSkip))
 	grpclog.SetLoggerV2(&loggerWrapper{logger: logger, sugar: logger.Sugar()})
 }