Susumu Yata
null+****@clear*****
Thu Jul 27 11:45:41 JST 2017
Susumu Yata 2017-07-27 11:45:41 +0900 (Thu, 27 Jul 2017) New Revision: febc7ebf545c00f5f375c449e5dee4ff4e45a708 https://github.com/groonga/grnci/commit/febc7ebf545c00f5f375c449e5dee4ff4e45a708 Message: Move broken from response to Conn. Modified files: v2/libgrn/conn.go v2/libgrn/response.go Modified: v2/libgrn/conn.go (+2 -1) =================================================================== --- v2/libgrn/conn.go 2017-07-27 11:33:45 +0900 (7880fb1) +++ v2/libgrn/conn.go 2017-07-27 11:45:41 +0900 (21acf34) @@ -23,7 +23,8 @@ type Conn struct { db *grnDB // C.grn_obj buf []byte // Copy buffer bufSize int // Copy buffer size - ready bool // Whether or not Exec is ready + ready bool // Whether or not the connection is ready to send a command + broken bool // Whether or not the connection is broken } // newConn returns a new Conn. Modified: v2/libgrn/response.go (+5 -6) =================================================================== --- v2/libgrn/response.go 2017-07-27 11:33:45 +0900 (29ad810) +++ v2/libgrn/response.go 2017-07-27 11:45:41 +0900 (6883810) @@ -15,7 +15,6 @@ type response struct { left []byte flags byte err error - broken bool closed bool } @@ -61,7 +60,7 @@ func (r *response) Read(p []byte) (n int, err error) { } data, flags, err := r.conn.ctx.Recv() if err != nil { - r.broken = true + r.conn.broken = true return 0, err } r.left = data @@ -78,9 +77,9 @@ func (r *response) Close() error { return nil } var err error - if !r.broken { + if !r.conn.broken { if _, err = io.CopyBuffer(ioutil.Discard, r, r.conn.getBuffer()); err != nil { - r.broken = true + r.conn.broken = true err = grnci.NewError(grnci.NetworkError, map[string]interface{}{ "method": "io.CopyBuffer", "error": err.Error(), @@ -88,12 +87,12 @@ func (r *response) Close() error { } } r.closed = true - if !r.broken { + if !r.conn.broken { r.conn.ready = true } if r.client != nil { // Broken connections are closed. - if r.broken { + if r.conn.broken { if e := r.conn.Close(); e != nil && err != nil { err = e } -------------- next part -------------- HTML����������������������������...Télécharger
