Merge pull request #256 from tmc/fix_error_code_tag

tmc · web-flow · commit ecf1225d8137 · 2016-11-18T16:36:28.000-08:00
Correct runtime.errorBody protobuf field tag
diff --git a/runtime/errors.go b/runtime/errors.go
@@ -64,7 +64,7 @@ var (
 
 type errorBody struct {
 	Error string `protobuf:"bytes,1,name=error" json:"error"`
-	Code  int    `protobuf:"bytes,2,name=code" json:"code"`
+	Code  int32  `protobuf:"varint,2,name=code" json:"code"`
 }
 
 //Make this also conform to proto.Message for builtin JSONPb Marshaler
@@ -85,7 +85,7 @@ func DefaultHTTPError(ctx context.Context, marshaler Marshaler, w http.ResponseW
 	w.Header().Set("Content-Type", marshaler.ContentType())
 	body := &errorBody{
 		Error: grpc.ErrorDesc(err),
-		Code:  int(grpc.Code(err)),
+		Code:  int32(grpc.Code(err)),
 	}
 
 	buf, merr := marshaler.Marshal(body)

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ var (`
`64`	`64`
`65`	`65`	`type errorBody struct {`
`66`	`66`	Error string `protobuf:"bytes,1,name=error" json:"error"`
`67`		- Code int `protobuf:"bytes,2,name=code" json:"code"`
	`67`	+ Code int32 `protobuf:"varint,2,name=code" json:"code"`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`//Make this also conform to proto.Message for builtin JSONPb Marshaler`
`@@ -85,7 +85,7 @@ func DefaultHTTPError(ctx context.Context, marshaler Marshaler, w http.ResponseW`
`85`	`85`	`w.Header().Set("Content-Type", marshaler.ContentType())`
`86`	`86`	`body := &errorBody{`
`87`	`87`	`Error: grpc.ErrorDesc(err),`
`88`		`- Code: int(grpc.Code(err)),`
	`88`	`+ Code: int32(grpc.Code(err)),`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`buf, merr := marshaler.Marshal(body)`