opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change grpc/transport to transport in error messages

Browse Source
This commit is contained in:
iamqizhao
2015-02-25 11:21:34 -08:00
parent ba60f33ca1
commit 491fdc57f4
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
transport/http2_client_transport.go
View File

@ -117,7 +117,7 @@ func newHTTP2Client(addr string, authOpts []credentials.Credentials) (_ ClientTr
conn, connErr = net.Dial("tcp", addr) conn, connErr = net.Dial("tcp", addr)
} }
if connErr != nil { if connErr != nil {
return nil, ConnectionErrorf("grpc/transport: %v", connErr) return nil, ConnectionErrorf("transport: %v", connErr)
} }
defer func() { defer func() {
if err != nil { if err != nil {
@ -127,14 +127,14 @@ func newHTTP2Client(addr string, authOpts []credentials.Credentials) (_ ClientTr
// Send connection preface to server. // Send connection preface to server.
n, err := conn.Write(clientPreface) n, err := conn.Write(clientPreface)
if err != nil { if err != nil {
return nil, ConnectionErrorf("grpc/transport: %v", err) return nil, ConnectionErrorf("transport: %v", err)
} }
if n != len(clientPreface) { if n != len(clientPreface) {
return nil, ConnectionErrorf("grpc/transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface)) return nil, ConnectionErrorf("transport: preface mismatch, wrote %d bytes; want %d", n, len(clientPreface))
} }
framer := http2.NewFramer(conn, conn) framer := http2.NewFramer(conn, conn)
if err := framer.WriteSettings(); err != nil { if err := framer.WriteSettings(); err != nil {
return nil, ConnectionErrorf("grpc/transport: %v", err) return nil, ConnectionErrorf("transport: %v", err)
} }
var buf bytes.Buffer var buf bytes.Buffer
t := &http2Client{ t := &http2Client{
@ -225,7 +225,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
default: default:
} }
if err != nil { if err != nil {
return nil, StreamErrorf(codes.InvalidArgument, "grpc/transport: %v", err) return nil, StreamErrorf(codes.InvalidArgument, "transport: %v", err)
} }
for k, v := range m { for k, v := range m {
t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: v}) t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: v})
@ -265,7 +265,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
} }
if err != nil { if err != nil {
t.notifyError() t.notifyError()
return nil, ConnectionErrorf("grpc/transport: %v", err) return nil, ConnectionErrorf("transport: %v", err)
} }
} }
s := t.newStream(ctx, callHdr) s := t.newStream(ctx, callHdr)
@ -276,7 +276,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
} }
if uint32(len(t.activeStreams)) >= t.maxStreams { if uint32(len(t.activeStreams)) >= t.maxStreams {
t.mu.Unlock() t.mu.Unlock()
return nil, StreamErrorf(codes.Unavailable, "grpc/transport: failed to create new stream because the limit has been reached.") return nil, StreamErrorf(codes.Unavailable, "transport: failed to create new stream because the limit has been reached.")
} }
t.activeStreams[s.id] = s t.activeStreams[s.id] = s
t.mu.Unlock() t.mu.Unlock()
@ -391,7 +391,7 @@ func (t *http2Client) Write(s *Stream, data []byte, opts *Options) error {
// invoked. // invoked.
if err := t.framer.WriteData(s.id, endStream, p); err != nil { if err := t.framer.WriteData(s.id, endStream, p); err != nil {
t.notifyError() t.notifyError()
return ConnectionErrorf("grpc/transport: %v", err) return ConnectionErrorf("transport: %v", err)
} }
t.writableChan <- 0 t.writableChan <- 0
if r.Len() == 0 { if r.Len() == 0 {

8
transport/http2_server_transport.go
View File

@ -52,7 +52,7 @@ import (
// ErrIllegalHeaderWrite indicates that setting header is illegal because of // ErrIllegalHeaderWrite indicates that setting header is illegal because of
// the stream's state. // the stream's state.
var ErrIllegalHeaderWrite = errors.New("grpc/transport: the stream is done or WriteHeader was already called") var ErrIllegalHeaderWrite = errors.New("transport: the stream is done or WriteHeader was already called")
// http2Server implements the ServerTransport interface with HTTP2. // http2Server implements the ServerTransport interface with HTTP2.
type http2Server struct { type http2Server struct {
@ -387,7 +387,7 @@ func (t *http2Server) writeHeaders(s *Stream, b *bytes.Buffer, endStream bool) e
} }
if err != nil { if err != nil {
t.Close() t.Close()
return ConnectionErrorf("grpc/transport: %v", err) return ConnectionErrorf("transport: %v", err)
} }
} }
return nil return nil
@ -478,7 +478,7 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
} }
if err := t.framer.WriteHeaders(p); err != nil { if err := t.framer.WriteHeaders(p); err != nil {
t.Close() t.Close()
return ConnectionErrorf("grpc/transport: %v", err) return ConnectionErrorf("transport: %v", err)
} }
t.writableChan <- 0 t.writableChan <- 0
} }
@ -526,7 +526,7 @@ func (t *http2Server) Write(s *Stream, data []byte, opts *Options) error {
} }
if err := t.framer.WriteData(s.id, false, p); err != nil { if err := t.framer.WriteData(s.id, false, p); err != nil {
t.Close() t.Close()
return ConnectionErrorf("grpc/transport: %v", err) return ConnectionErrorf("transport: %v", err)
} }
t.writableChan <- 0 t.writableChan <- 0
} }

16
transport/http_util.go
View File

@ -137,7 +137,7 @@ func newHPACKDecoder() *hpackDecoder {
case "grpc-status": case "grpc-status":
code, err := strconv.Atoi(f.Value) code, err := strconv.Atoi(f.Value)
if err != nil { if err != nil {
d.err = StreamErrorf(codes.Internal, "grpc/transport: malformed grpc-status: %v", err) d.err = StreamErrorf(codes.Internal, "transport: malformed grpc-status: %v", err)
return return
} }
d.state.statusCode = codes.Code(code) d.state.statusCode = codes.Code(code)
@ -148,7 +148,7 @@ func newHPACKDecoder() *hpackDecoder {
var err error var err error
d.state.timeout, err = timeoutDecode(f.Value) d.state.timeout, err = timeoutDecode(f.Value)
if err != nil { if err != nil {
d.err = StreamErrorf(codes.Internal, "grpc/transport: malformed time-out: %v", err) d.err = StreamErrorf(codes.Internal, "transport: malformed time-out: %v", err)
return return
} }
case ":path": case ":path":
@ -174,12 +174,12 @@ func (d *hpackDecoder) decodeClientHTTP2Headers(s *Stream, frame headerFrame) (e
d.err = nil d.err = nil
_, err = d.h.Write(frame.HeaderBlockFragment()) _, err = d.h.Write(frame.HeaderBlockFragment())
if err != nil { if err != nil {
err = StreamErrorf(codes.Internal, "grpc/transport: HPACK header decode error: %v", err) err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err)
} }
if frame.HeadersEnded() { if frame.HeadersEnded() {
if closeErr := d.h.Close(); closeErr != nil && err == nil { if closeErr := d.h.Close(); closeErr != nil && err == nil {
err = StreamErrorf(codes.Internal, "grpc/transport: HPACK decoder close error: %v", closeErr) err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr)
} }
endHeaders = true endHeaders = true
} }
@ -194,12 +194,12 @@ func (d *hpackDecoder) decodeServerHTTP2Headers(s *Stream, frame headerFrame) (e
d.err = nil d.err = nil
_, err = d.h.Write(frame.HeaderBlockFragment()) _, err = d.h.Write(frame.HeaderBlockFragment())
if err != nil { if err != nil {
err = StreamErrorf(codes.Internal, "grpc/transport: HPACK header decode error: %v", err) err = StreamErrorf(codes.Internal, "transport: HPACK header decode error: %v", err)
} }
if frame.HeadersEnded() { if frame.HeadersEnded() {
if closeErr := d.h.Close(); closeErr != nil && err == nil { if closeErr := d.h.Close(); closeErr != nil && err == nil {
err = StreamErrorf(codes.Internal, "grpc/transport: HPACK decoder close error: %v", closeErr) err = StreamErrorf(codes.Internal, "transport: HPACK decoder close error: %v", closeErr)
} }
endHeaders = true endHeaders = true
} }
@ -275,12 +275,12 @@ func timeoutEncode(t time.Duration) string {
func timeoutDecode(s string) (time.Duration, error) { func timeoutDecode(s string) (time.Duration, error) {
size := len(s) size := len(s)
if size < 2 { if size < 2 {
return 0, fmt.Errorf("grpc/transport: timeout string is too short: %q", s) return 0, fmt.Errorf("transport: timeout string is too short: %q", s)
} }
unit := timeoutUnit(s[size-1]) unit := timeoutUnit(s[size-1])
d, ok := timeoutUnitToDuration(unit) d, ok := timeoutUnitToDuration(unit)
if !ok { if !ok {
return 0, fmt.Errorf("grpc/transport: timeout unit is not recognized: %q", s) return 0, fmt.Errorf("transport: timeout unit is not recognized: %q", s)
} }
t, err := strconv.ParseInt(s[:size-1], 10, 64) t, err := strconv.ParseInt(s[:size-1], 10, 64)
if err != nil { if err != nil {

6
transport/http_util_test.go
View File

@ -75,9 +75,9 @@ func TestTimeoutDecode(t *testing.T) {
err error err error
}{ }{
{"1234S", time.Second * 1234, nil}, {"1234S", time.Second * 1234, nil},
{"1234x", 0, fmt.Errorf("grpc/transport: timeout unit is not recognized: %q", "1234x")}, {"1234x", 0, fmt.Errorf("transport: timeout unit is not recognized: %q", "1234x")},
{"1", 0, fmt.Errorf("grpc/transport: timeout string is too short: %q", "1")}, {"1", 0, fmt.Errorf("transport: timeout string is too short: %q", "1")},
{"", 0, fmt.Errorf("grpc/transport: timeout string is too short: %q", "")}, {"", 0, fmt.Errorf("transport: timeout string is too short: %q", "")},
} { } {
d, err := timeoutDecode(test.s) d, err := timeoutDecode(test.s)
if d != test.d || fmt.Sprint(err) != fmt.Sprint(test.err) { if d != test.d || fmt.Sprint(err) != fmt.Sprint(test.err) {

2
transport/transport.go
View File

@ -247,7 +247,7 @@ func (s *Stream) StatusDesc() string {
// ErrIllegalTrailerSet indicates that the trailer has already been set or it // ErrIllegalTrailerSet indicates that the trailer has already been set or it
// is too late to do so. // is too late to do so.
var ErrIllegalTrailerSet = errors.New("grpc/transport: trailer has been set") var ErrIllegalTrailerSet = errors.New("transport: trailer has been set")
// SetTrailer sets the trailer metadata which will be sent with the RPC status // SetTrailer sets the trailer metadata which will be sent with the RPC status
// by the server. This can only be called at most once. Server side only. // by the server. This can only be called at most once. Server side only.