Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-15 08:14:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

回滚版本

Browse Source
This commit is contained in:
boyce
2019-10-29 14:26:22 +08:00
parent e266c50ed6
commit ca0e04a89d
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rpc/client.go
View File

@@ -51,7 +51,6 @@ type Client struct {
pending map[uint64]*Call pending map[uint64]*Call
closing bool // user has called Close closing bool // user has called Close
shutdown bool // server has told us to stop shutdown bool // server has told us to stop
bPipe bool
} }
// A ClientCodec implements writing of RPC requests and // A ClientCodec implements writing of RPC requests and
@@ -152,9 +151,6 @@ func (client *Client) input() {
if err != nil { if err != nil {
call.Error = errors.New("reading body " + err.Error()) call.Error = errors.New("reading body " + err.Error())
} }
if client.bPipe {
err = nil
}
call.done() call.done()
} }
} }
@@ -203,19 +199,18 @@ func (call *Call) done() {
// so no interlocking is required. However each half may be accessed // so no interlocking is required. However each half may be accessed
// concurrently so the implementation of conn should protect against // concurrently so the implementation of conn should protect against
// concurrent reads or concurrent writes. // concurrent reads or concurrent writes.
func NewClient(conn io.ReadWriteCloser, isPipe bool) *Client { func NewClient(conn io.ReadWriteCloser) *Client {
encBuf := bufio.NewWriter(conn) encBuf := bufio.NewWriter(conn)
client := &gobClientCodec{conn, gob.NewDecoder(conn), gob.NewEncoder(encBuf), encBuf} client := &gobClientCodec{conn, gob.NewDecoder(conn), gob.NewEncoder(encBuf), encBuf}
return NewClientWithCodec(client, isPipe) return NewClientWithCodec(client)
} }
// NewClientWithCodec is like NewClient but uses the specified // NewClientWithCodec is like NewClient but uses the specified
// codec to encode requests and decode responses. // codec to encode requests and decode responses.
func NewClientWithCodec(codec ClientCodec, isPipe bool) *Client { func NewClientWithCodec(codec ClientCodec) *Client {
client := &Client{ client := &Client{
codec: codec, codec: codec,
pending: make(map[uint64]*Call), pending: make(map[uint64]*Call),
bPipe: isPipe,
} }
go client.input() go client.input()
return client return client
@@ -274,7 +269,7 @@ func DialHTTPPath(network, address, path string) (*Client, error) {
// before switching to RPC protocol. // before switching to RPC protocol.
resp, err := http.ReadResponse(bufio.NewReader(conn), &http.Request{Method: "CONNECT"}) resp, err := http.ReadResponse(bufio.NewReader(conn), &http.Request{Method: "CONNECT"})
if err == nil && resp.Status == connected { if err == nil && resp.Status == connected {
return NewClient(conn, false), nil return NewClient(conn), nil
} }
if err == nil { if err == nil {
err = errors.New("unexpected HTTP response: " + resp.Status) err = errors.New("unexpected HTTP response: " + resp.Status)
@@ -296,7 +291,7 @@ func Dial(network, address string) (*Client, error) {
} }
tcpconn, _ := conn.(*net.TCPConn) tcpconn, _ := conn.(*net.TCPConn)
tcpconn.SetNoDelay(true) tcpconn.SetNoDelay(true)
return NewClient(conn, false), nil return NewClient(conn), nil
} }
func DialTimeOut(network, address string, timeout time.Duration) (*Client, error) { func DialTimeOut(network, address string, timeout time.Duration) (*Client, error) {
@@ -306,7 +301,7 @@ func DialTimeOut(network, address string, timeout time.Duration) (*Client, error
} }
tcpconn, _ := conn.(*net.TCPConn) tcpconn, _ := conn.(*net.TCPConn)
tcpconn.SetNoDelay(true) tcpconn.SetNoDelay(true)
return NewClient(conn, false), nil return NewClient(conn), nil
} }
// Close calls the underlying codec's Close method. If the connection is already // Close calls the underlying codec's Close method. If the connection is already