opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use log instead of grpclog in routeguide example (#1395)

Browse Source
This commit is contained in:
Menghan Li
2017-07-31 10:40:59 -07:00
committed by GitHub
parent 971efedc20
commit 98bc2cec5b
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
examples/route_guide/client/client.go
View File

@ -25,6 +25,7 @@ package main
import ( import (
"flag" "flag"
"io" "io"
"log"
"math/rand" "math/rand"
"time" "time"
@ -32,7 +33,6 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
pb "google.golang.org/grpc/examples/route_guide/routeguide" pb "google.golang.org/grpc/examples/route_guide/routeguide"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/testdata" "google.golang.org/grpc/testdata"
) )
@ -45,20 +45,20 @@ var (
// printFeature gets the feature for the given point. // printFeature gets the feature for the given point.
func printFeature(client pb.RouteGuideClient, point *pb.Point) { func printFeature(client pb.RouteGuideClient, point *pb.Point) {
grpclog.Printf("Getting feature for point (%d, %d)", point.Latitude, point.Longitude) log.Printf("Getting feature for point (%d, %d)", point.Latitude, point.Longitude)
feature, err := client.GetFeature(context.Background(), point) feature, err := client.GetFeature(context.Background(), point)
if err != nil { if err != nil {
grpclog.Fatalf("%v.GetFeatures(_) = _, %v: ", client, err) log.Fatalf("%v.GetFeatures(_) = _, %v: ", client, err)
} }
grpclog.Println(feature) log.Println(feature)
} }
// printFeatures lists all the features within the given bounding Rectangle. // printFeatures lists all the features within the given bounding Rectangle.
func printFeatures(client pb.RouteGuideClient, rect *pb.Rectangle) { func printFeatures(client pb.RouteGuideClient, rect *pb.Rectangle) {
grpclog.Printf("Looking for features within %v", rect) log.Printf("Looking for features within %v", rect)
stream, err := client.ListFeatures(context.Background(), rect) stream, err := client.ListFeatures(context.Background(), rect)
if err != nil { if err != nil {
grpclog.Fatalf("%v.ListFeatures(_) = _, %v", client, err) log.Fatalf("%v.ListFeatures(_) = _, %v", client, err)
} }
for { for {
feature, err := stream.Recv() feature, err := stream.Recv()
@ -66,9 +66,9 @@ func printFeatures(client pb.RouteGuideClient, rect *pb.Rectangle) {
break break
} }
if err != nil { if err != nil {
grpclog.Fatalf("%v.ListFeatures(_) = _, %v", client, err) log.Fatalf("%v.ListFeatures(_) = _, %v", client, err)
} }
grpclog.Println(feature) log.Println(feature)
} }
} }
@ -81,21 +81,21 @@ func runRecordRoute(client pb.RouteGuideClient) {
for i := 0; i < pointCount; i++ { for i := 0; i < pointCount; i++ {
points = append(points, randomPoint(r)) points = append(points, randomPoint(r))
} }
grpclog.Printf("Traversing %d points.", len(points)) log.Printf("Traversing %d points.", len(points))
stream, err := client.RecordRoute(context.Background()) stream, err := client.RecordRoute(context.Background())
if err != nil { if err != nil {
grpclog.Fatalf("%v.RecordRoute(_) = _, %v", client, err) log.Fatalf("%v.RecordRoute(_) = _, %v", client, err)
} }
for _, point := range points { for _, point := range points {
if err := stream.Send(point); err != nil { if err := stream.Send(point); err != nil {
grpclog.Fatalf("%v.Send(%v) = %v", stream, point, err) log.Fatalf("%v.Send(%v) = %v", stream, point, err)
} }
} }
reply, err := stream.CloseAndRecv() reply, err := stream.CloseAndRecv()
if err != nil { if err != nil {
grpclog.Fatalf("%v.CloseAndRecv() got error %v, want %v", stream, err, nil) log.Fatalf("%v.CloseAndRecv() got error %v, want %v", stream, err, nil)
} }
grpclog.Printf("Route summary: %v", reply) log.Printf("Route summary: %v", reply)
} }
// runRouteChat receives a sequence of route notes, while sending notes for various locations. // runRouteChat receives a sequence of route notes, while sending notes for various locations.
@ -110,7 +110,7 @@ func runRouteChat(client pb.RouteGuideClient) {
} }
stream, err := client.RouteChat(context.Background()) stream, err := client.RouteChat(context.Background())
if err != nil { if err != nil {
grpclog.Fatalf("%v.RouteChat(_) = _, %v", client, err) log.Fatalf("%v.RouteChat(_) = _, %v", client, err)
} }
waitc := make(chan struct{}) waitc := make(chan struct{})
go func() { go func() {
@ -122,14 +122,14 @@ func runRouteChat(client pb.RouteGuideClient) {
return return
} }
if err != nil { if err != nil {
grpclog.Fatalf("Failed to receive a note : %v", err) log.Fatalf("Failed to receive a note : %v", err)
} }
grpclog.Printf("Got message %s at point(%d, %d)", in.Message, in.Location.Latitude, in.Location.Longitude) log.Printf("Got message %s at point(%d, %d)", in.Message, in.Location.Latitude, in.Location.Longitude)
} }
}() }()
for _, note := range notes { for _, note := range notes {
if err := stream.Send(note); err != nil { if err := stream.Send(note); err != nil {
grpclog.Fatalf("Failed to send a note: %v", err) log.Fatalf("Failed to send a note: %v", err)
} }
} }
stream.CloseSend() stream.CloseSend()
@ -151,7 +151,7 @@ func main() {
} }
creds, err := credentials.NewClientTLSFromFile(*caFile, *serverHostOverride) creds, err := credentials.NewClientTLSFromFile(*caFile, *serverHostOverride)
if err != nil { if err != nil {
grpclog.Fatalf("Failed to create TLS credentials %v", err) log.Fatalf("Failed to create TLS credentials %v", err)
} }
opts = append(opts, grpc.WithTransportCredentials(creds)) opts = append(opts, grpc.WithTransportCredentials(creds))
} else { } else {
@ -159,7 +159,7 @@ func main() {
} }
conn, err := grpc.Dial(*serverAddr, opts...) conn, err := grpc.Dial(*serverAddr, opts...)
if err != nil { if err != nil {
grpclog.Fatalf("fail to dial: %v", err) log.Fatalf("fail to dial: %v", err)
} }
defer conn.Close() defer conn.Close()
client := pb.NewRouteGuideClient(conn) client := pb.NewRouteGuideClient(conn)

10
examples/route_guide/server/server.go
View File

@ -28,6 +28,7 @@ import (
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"log"
"math" "math"
"net" "net"
"time" "time"
@ -36,7 +37,6 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/testdata" "google.golang.org/grpc/testdata"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
@ -145,10 +145,10 @@ func (s *routeGuideServer) RouteChat(stream pb.RouteGuide_RouteChatServer) error
func (s *routeGuideServer) loadFeatures(filePath string) { func (s *routeGuideServer) loadFeatures(filePath string) {
file, err := ioutil.ReadFile(filePath) file, err := ioutil.ReadFile(filePath)
if err != nil { if err != nil {
grpclog.Fatalf("Failed to load default features: %v", err) log.Fatalf("Failed to load default features: %v", err)
} }
if err := json.Unmarshal(file, &s.savedFeatures); err != nil { if err := json.Unmarshal(file, &s.savedFeatures); err != nil {
grpclog.Fatalf("Failed to load default features: %v", err) log.Fatalf("Failed to load default features: %v", err)
} }
} }
@ -209,7 +209,7 @@ func main() {
flag.Parse() flag.Parse()
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port)) lis, err := net.Listen("tcp", fmt.Sprintf(":%d", *port))
if err != nil { if err != nil {
grpclog.Fatalf("failed to listen: %v", err) log.Fatalf("failed to listen: %v", err)
} }
var opts []grpc.ServerOption var opts []grpc.ServerOption
if *tls { if *tls {
@ -221,7 +221,7 @@ func main() {
} }
creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile) creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile)
if err != nil { if err != nil {
grpclog.Fatalf("Failed to generate credentials %v", err) log.Fatalf("Failed to generate credentials %v", err)
} }
opts = []grpc.ServerOption{grpc.Creds(creds)} opts = []grpc.ServerOption{grpc.Creds(creds)}
} }