grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix comments

This commit is contained in:
Menghan Li 2016-11-08 10:31:02 -08:00
parent 3de821b781
commit ff0b1db33e
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server.go
View File

@ -589,13 +589,11 @@ func (s *Server) processUnaryRPC(t transport.ServerTransport, stream *transport.
} }
defer func() { defer func() {
if stats.On() { if stats.On() {
var e error
if err != nil && err != io.EOF {
e = toRPCErr(err)
}
end := &stats.End{ end := &stats.End{
EndTime: time.Now(), EndTime: time.Now(),
Error: e, }
if err != nil && err != io.EOF {
end.Error = toRPCErr(err)
} }
stats.Handle(stream.Context(), end) stats.Handle(stream.Context(), end)
} }
@ -757,13 +755,11 @@ func (s *Server) processStreamingRPC(t transport.ServerTransport, stream *transp
} }
defer func() { defer func() {
if stats.On() { if stats.On() {
var e error
if err != nil && err != io.EOF {
e = toRPCErr(err)
}
end := &stats.End{ end := &stats.End{
EndTime: time.Now(), EndTime: time.Now(),
Error: e, }
if err != nil && err != io.EOF {
end.Error = toRPCErr(err)
} }
stats.Handle(stream.Context(), end) stats.Handle(stream.Context(), end)
} }

14
stream.go
View File

@ -300,7 +300,8 @@ func (cs *clientStream) SendMsg(m interface{}) (err error) {
} }
cs.mu.Unlock() cs.mu.Unlock()
} }
// TODO generate stats.End if err != nil && err != io.EOF. // TODO Investigate how to signal the stats handling party.
// generate error stats if err != nil && err != io.EOF?
defer func() { defer func() {
if err != nil { if err != nil {
cs.finish(err) cs.finish(err)
@ -349,14 +350,15 @@ func (cs *clientStream) SendMsg(m interface{}) (err error) {
func (cs *clientStream) RecvMsg(m interface{}) (err error) { func (cs *clientStream) RecvMsg(m interface{}) (err error) {
defer func() { defer func() {
if err != nil && stats.On() { if err != nil && stats.On() {
var e error // Only generate End if err != nil.
if err != nil && err != io.EOF { // If err == nil, it's not the last RecvMsg.
e = toRPCErr(err) // The last RecvMsg gets either an RPC error or io.EOF.
}
end := &stats.End{ end := &stats.End{
Client: true, Client: true,
EndTime: time.Now(), EndTime: time.Now(),
Error: e, }
if err != io.EOF {
end.Error = toRPCErr(err)
} }
stats.Handle(cs.statsCtx, end) stats.Handle(cs.statsCtx, end)
} }