fix some bugs

This commit is contained in:
iamqizhao
2015-03-13 00:16:18 -07:00
parent ebb6f762cb
commit e10de7abd1
7 changed files with 43 additions and 85 deletions

13
call.go
View File

@ -34,14 +34,14 @@
package grpc
import (
"io"
"net"
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/transport"
"io"
"log"
"net"
)
// recv receives and parses an RPC response.
@ -127,8 +127,10 @@ func Invoke(ctx context.Context, method string, args, reply proto.Message, cc *C
Last: true,
Delay: false,
}
ts := 0
var lastErr error // record the error that happened
var (
ts int // track the transport sequence number
lastErr error // record the error that happened
)
for {
var (
err error
@ -165,6 +167,7 @@ func Invoke(ctx context.Context, method string, args, reply proto.Message, cc *C
}
t.CloseStream(stream, lastErr)
if lastErr != nil {
log.Println("exit 5: ", lastErr)
return toRPCErr(lastErr)
}
return Errorf(stream.StatusCode(), stream.StatusDesc())