Skip to content

Commit

Permalink
Replace glog with grpclog
Browse files Browse the repository at this point in the history
This allows projects with forked versions of glog (e.g. CockroachDB) to
use grpc-gateway without a flag collision on the glog flags.
  • Loading branch information
Cuong Do committed Mar 1, 2016
1 parent 8ef22a6 commit 309f6cc
Show file tree
Hide file tree
Showing 10 changed files with 68 additions and 76 deletions.
26 changes: 13 additions & 13 deletions examples/examplepb/a_bit_of_everything.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions examples/examplepb/echo_service.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions examples/examplepb/flow_combination.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion protoc-gen-grpc-gateway/gengateway/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ func New(reg *descriptor.Registry) gen.Generator {
"net/http",
"github.com/gengo/grpc-gateway/runtime",
"github.com/gengo/grpc-gateway/utilities",
"github.com/golang/glog",
"github.com/golang/protobuf/proto",
"golang.org/x/net/context",
"google.golang.org/grpc",
"google.golang.org/grpc/codes",
"google.golang.org/grpc/grpclog",
} {
pkg := descriptor.GoPackage{
Path: pkgpath,
Expand Down
14 changes: 7 additions & 7 deletions protoc-gen-grpc-gateway/gengateway/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx cont
var metadata runtime.ServerMetadata
stream, err := client.{{.Method.GetName}}(ctx)
if err != nil {
glog.Errorf("Failed to start streaming: %v", err)
grpclog.Printf("Failed to start streaming: %v", err)
return nil, metadata, err
}
dec := json.NewDecoder(req.Body)
Expand All @@ -148,22 +148,22 @@ func request_{{.Method.Service.GetName}}_{{.Method.GetName}}_{{.Index}}(ctx cont
break
}
if err != nil {
glog.Errorf("Failed to decode request: %v", err)
grpclog.Printf("Failed to decode request: %v", err)
return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err)
}
if err = stream.Send(&protoReq); err != nil {
glog.Errorf("Failed to send request: %v", err)
grpclog.Printf("Failed to send request: %v", err)
return nil, metadata, err
}
}
if err := stream.CloseSend(); err != nil {
glog.Errorf("Failed to terminate client stream: %v", err)
grpclog.Printf("Failed to terminate client stream: %v", err)
return nil, metadata, err
}
header, err := stream.Header()
if err != nil {
glog.Errorf("Failed to get header from client: %v", err)
grpclog.Printf("Failed to get header from client: %v", err)
return nil, metadata, err
}
metadata.HeaderMD = header
Expand Down Expand Up @@ -247,14 +247,14 @@ func Register{{$svc.GetName}}HandlerFromEndpoint(ctx context.Context, mux *runti
defer func() {
if err != nil {
if cerr := conn.Close(); cerr != nil {
glog.Errorf("Failed to close conn to %s: %v", endpoint, cerr)
grpclog.Printf("Failed to close conn to %s: %v", endpoint, cerr)
}
return
}
go func() {
<-ctx.Done()
if cerr := conn.Close(); cerr != nil {
glog.Errorf("Failed to close conn to %s: %v", endpoint, cerr)
grpclog.Printf("Failed to close conn to %s: %v", endpoint, cerr)
}
}()
}()
Expand Down
12 changes: 6 additions & 6 deletions runtime/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"io"
"net/http"

"github.com/golang/glog"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/grpclog"
)

// HTTPStatusFromCode converts a gRPC error code into the corresponding HTTP response status.
Expand Down Expand Up @@ -50,7 +50,7 @@ func HTTPStatusFromCode(code codes.Code) int {
return http.StatusInternalServerError
}

glog.Errorf("Unknown gRPC error code: %v", code)
grpclog.Printf("Unknown gRPC error code: %v", code)
return http.StatusInternalServerError
}

Expand Down Expand Up @@ -84,24 +84,24 @@ func DefaultHTTPError(ctx context.Context, w http.ResponseWriter, _ *http.Reques
}
buf, merr := json.Marshal(body)
if merr != nil {
glog.Errorf("Failed to marshal error message %q: %v", body, merr)
grpclog.Printf("Failed to marshal error message %q: %v", body, merr)
w.WriteHeader(http.StatusInternalServerError)
if _, err := io.WriteString(w, fallback); err != nil {
glog.Errorf("Failed to write response: %v", err)
grpclog.Printf("Failed to write response: %v", err)
}
return
}

md, ok := ServerMetadataFromContext(ctx)
if !ok {
glog.Errorf("Failed to extract ServerMetadata from context")
grpclog.Printf("Failed to extract ServerMetadata from context")
}

handleForwardResponseServerMetadata(w, md)
st := HTTPStatusFromCode(grpc.Code(err))
w.WriteHeader(st)
if _, err := w.Write(buf); err != nil {
glog.Errorf("Failed to write response: %v", err)
grpclog.Printf("Failed to write response: %v", err)
}

handleForwardResponseTrailer(w, md)
Expand Down
Loading

0 comments on commit 309f6cc

Please sign in to comment.