Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion drpcclient/dialoptions.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ func DialContext(ctx context.Context, address string, opts ...DialOption) (conn
Stream: drpcstream.Options{
MaximumBufferSize: 0, // unlimited
},
SoftCancel: false,
},
}), nil
}
21 changes: 2 additions & 19 deletions drpcconn/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,7 @@ func (c *Conn) Invoke(ctx context.Context, rpc string, enc drpc.Encoding, in, ou
}

func (c *Conn) doInvoke(stream *drpcstream.Stream, enc drpc.Encoding, rpc string, data []byte, metadata []byte, out drpc.Message) (err error) {
if len(metadata) > 0 {
if err := stream.RawWrite(drpcwire.KindInvokeMetadata, metadata); err != nil {
return err
}
}
if err := stream.RawWrite(drpcwire.KindInvoke, []byte(rpc)); err != nil {
if err := stream.WriteInvoke(rpc, metadata); err != nil {
return err
}
if err := stream.RawWrite(drpcwire.KindMessage, data); err != nil {
Expand Down Expand Up @@ -171,25 +166,13 @@ func (c *Conn) NewStream(ctx context.Context, rpc string, enc drpc.Encoding) (_
return nil, err
}

if err := c.doNewStream(stream, rpc, metadata); err != nil {
if err := stream.WriteInvoke(rpc, metadata); err != nil {
return nil, errs.Combine(err, stream.Close())
}

return stream, nil
}

func (c *Conn) doNewStream(stream *drpcstream.Stream, rpc string, metadata []byte) error {
if len(metadata) > 0 {
if err := stream.RawWrite(drpcwire.KindInvokeMetadata, metadata); err != nil {
return err
}
}
if err := stream.RawWrite(drpcwire.KindInvoke, []byte(rpc)); err != nil {
return err
}
return nil
}

// encodeMetadata retrieves and encodes metadata from the provided
// (outgoing/client) context.
func (c *Conn) encodeMetadata(ctx context.Context) (metadata []byte, err error) {
Expand Down
Loading