example: example/grpc update

gone-io · Jun 19, 2024 · 5622a8d · 5622a8d
1 parent a095015
commit 5622a8d
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 30 deletions.
diff --git a/example/grpc/Makefile b/example/grpc/Makefile
@@ -2,17 +2,13 @@
 .PHONY: client
 
 pb:
-	make dep
+	go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
 	protoc --go_out=. --go_opt=paths=source_relative \
 	--go-grpc_out=. --go-grpc_opt=paths=source_relative \
 	proto/hello.proto
 
 
-dep:
-	go get google.golang.org/protobuf/cmd/protoc-gen-go
-	go install google.golang.org/protobuf/cmd/protoc-gen-go
-	go get google.golang.org/grpc/cmd/protoc-gen-go-grpc
-	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
 
 server:
 	go run server/main.go

diff --git a/example/grpc/client/main.go b/example/grpc/client/main.go
@@ -27,20 +27,21 @@ func (c *helloClient) Stub(conn *grpc.ClientConn) {
 }
 
 func main() {
-	gone.Prepare(func(cemetery gone.Cemetery) error {
-		_ = goner.BasePriest(cemetery)
-		_ = goner.GrpcClientPriest(cemetery)
+	gone.
+		Prepare(func(cemetery gone.Cemetery) error {
+			_ = goner.GrpcClientPriest(cemetery)
 
-		cemetery.Bury(&helloClient{})
-		return nil
-	}).AfterStart(func(in struct {
-		hello *helloClient `gone:"*"`
-	}) {
-		say, err := in.hello.Say(context.Background(), &proto.SayRequest{Name: "gone"})
-		if err != nil {
-			log.Printf("er:%v", err)
-			return
-		}
-		log.Printf("say result: %s", say.Message)
-	}).Run()
+			cemetery.Bury(&helloClient{})
+			return nil
+		}).
+		Run(func(in struct {
+			hello *helloClient `gone:"*"`
+		}) {
+			say, err := in.hello.Say(context.Background(), &proto.SayRequest{Name: "gone"})
+			if err != nil {
+				log.Printf("er:%v", err)
+				return
+			}
+			log.Printf("say result: %s", say.Message)
+		})
 }
diff --git a/example/grpc/server/main.go b/example/grpc/server/main.go
@@ -26,12 +26,13 @@ func (s *server) RegisterGrpcServer(server *grpc.Server) {
 }
 
 func main() {
-	gone.Prepare(func(cemetery gone.Cemetery) error {
-		_ = goner.BasePriest(cemetery)
-		_ = cmux.Priest(cemetery)
-		_ = goner.GrpcServerPriest(cemetery)
+	gone.
+		Prepare(func(cemetery gone.Cemetery) error {
+			_ = cmux.Priest(cemetery)
+			_ = goner.GrpcServerPriest(cemetery)
 
-		cemetery.Bury(&server{})
-		return nil
-	}).Serve()
+			cemetery.Bury(&server{})
+			return nil
+		}).
+		Serve()
 }
diff --git a/goner/logrus/priest.go b/goner/logrus/priest.go
@@ -9,7 +9,10 @@ import (
 func Priest(cemetery gone.Cemetery) error {
 	t := cemetery.GetTomById(gone.IdGoneLogger)
 	if t != nil && t.GetGoner().(gone.Logger) != gone.GetSimpleLogger() {
-		t.GetGoner().(gone.Logger).Warn("logger is loaded, logrus logger not used")
+		_, ok := t.GetGoner().(*logger)
+		if !ok {
+			t.GetGoner().(gone.Logger).Warn("logger is loaded, logrus logger not used")
+		}
 		return nil
 	}
 	_ = config.Priest(cemetery)

diff --git a/goner/zap/priest.go b/goner/zap/priest.go
@@ -9,7 +9,10 @@ import (
 func Priest(cemetery gone.Cemetery) error {
 	t := cemetery.GetTomById(gone.IdGoneLogger)
 	if t != nil && t.GetGoner().(gone.Logger) != gone.GetSimpleLogger() {
-		t.GetGoner().(gone.Logger).Warn("logger is loaded, zap logger not used")
+		_, ok := t.GetGoner().(*sugar)
+		if !ok {
+			t.GetGoner().(gone.Logger).Warn("logger is loaded, zap logger not used")
+		}
 		return nil
 	}