Merge pull request ThreeDotsLabs#22 from maratori/data-race

Fix data race
thalesfsp · Apr 5, 2021 · 8fa596b · 8fa596b
2 parents 8e43771 + 8337e9d
commit 8fa596b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/internal/common/server/grpc.go b/internal/common/server/grpc.go
@@ -12,6 +12,10 @@ import (
 	"google.golang.org/grpc"
 )
 
+func init() {
+	grpc_logrus.ReplaceGrpcLogger(logrus.NewEntry(logrus.StandardLogger()))
+}
+
 func RunGRPCServer(registerServer func(server *grpc.Server)) {
 	port := os.Getenv("PORT")
 	if port == "" {
@@ -23,7 +27,6 @@ func RunGRPCServer(registerServer func(server *grpc.Server)) {
 
 func RunGRPCServerOnAddr(addr string, registerServer func(server *grpc.Server)) {
 	logrusEntry := logrus.NewEntry(logrus.StandardLogger())
-	grpc_logrus.ReplaceGrpcLogger(logrusEntry)
 
 	grpcServer := grpc.NewServer(
 		grpc_middleware.WithUnaryServerChain(

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -5,4 +5,4 @@ readonly service="$1"
 readonly env_file="$2"
 
 cd "./internal/$service"
-env $(cat "../../.env" "../../$env_file" | grep -Ev '^#' | xargs) go test -count=1 -p=8 -parallel=8 ./...
+env $(cat "../../.env" "../../$env_file" | grep -Ev '^#' | xargs) go test -count=1 -p=8 -parallel=8 -race ./...