Updating zookeeper dependency since logging problem has been solved in main repository. Go fmt run on project to tidy it up.
This commit is contained in:
parent
b3e55be98b
commit
3bf2e8a831
13 changed files with 296 additions and 152 deletions
11
vendor/github.com/samuel/go-zookeeper/zk/structs.go
generated
vendored
11
vendor/github.com/samuel/go-zookeeper/zk/structs.go
generated
vendored
|
@ -270,6 +270,7 @@ type multiResponseOp struct {
|
|||
Header multiHeader
|
||||
String string
|
||||
Stat *Stat
|
||||
Err ErrCode
|
||||
}
|
||||
type multiResponse struct {
|
||||
Ops []multiResponseOp
|
||||
|
@ -327,6 +328,8 @@ func (r *multiRequest) Decode(buf []byte) (int, error) {
|
|||
}
|
||||
|
||||
func (r *multiResponse) Decode(buf []byte) (int, error) {
|
||||
var multiErr error
|
||||
|
||||
r.Ops = make([]multiResponseOp, 0)
|
||||
r.DoneHeader = multiHeader{-1, true, -1}
|
||||
total := 0
|
||||
|
@ -347,6 +350,8 @@ func (r *multiResponse) Decode(buf []byte) (int, error) {
|
|||
switch header.Type {
|
||||
default:
|
||||
return total, ErrAPIError
|
||||
case opError:
|
||||
w = reflect.ValueOf(&res.Err)
|
||||
case opCreate:
|
||||
w = reflect.ValueOf(&res.String)
|
||||
case opSetData:
|
||||
|
@ -362,8 +367,12 @@ func (r *multiResponse) Decode(buf []byte) (int, error) {
|
|||
total += n
|
||||
}
|
||||
r.Ops = append(r.Ops, res)
|
||||
if multiErr == nil && res.Err != errOk {
|
||||
// Use the first error as the error returned from Multi().
|
||||
multiErr = res.Err.toError()
|
||||
}
|
||||
}
|
||||
return total, nil
|
||||
return total, multiErr
|
||||
}
|
||||
|
||||
type watcherEvent struct {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue