Skip to content

Commit

Permalink
Stop marshalling any.Any types unnecessarily.
Browse files Browse the repository at this point in the history
Fixes #576.
  • Loading branch information
johanbrandhorst committed Mar 17, 2018
1 parent 58f78b9 commit e3b25f1
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions runtime/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"net/http"

"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/any"
"golang.org/x/net/context"
"google.golang.org/grpc/codes"
Expand Down Expand Up @@ -93,19 +92,9 @@ func DefaultHTTPError(ctx context.Context, mux *ServeMux, marshaler Marshaler, w
}

body := &errorBody{
Error: s.Message(),
Code: int32(s.Code()),
}

for _, detail := range s.Details() {
if det, ok := detail.(proto.Message); ok {
a, err := ptypes.MarshalAny(det)
if err != nil {
grpclog.Printf("Failed to marshal any: %v", err)
} else {
body.Details = append(body.Details, a)
}
}
Error: s.Message(),
Code: int32(s.Code()),
Details: s.Proto().GetDetails(),
}

buf, merr := marshaler.Marshal(body)
Expand Down

0 comments on commit e3b25f1

Please sign in to comment.