Skip to content

Commit

Permalink
Minor fixups.
Browse files Browse the repository at this point in the history
  • Loading branch information
brett19 committed Feb 18, 2015
1 parent 09e283a commit 21f169a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions bucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type ioCtrCallback func(uint64, uint64, error)
type hlpGetHandler func(ioGetCallback) (pendingOp, error)

func (b *Bucket) hlpGetExec(valuePtr interface{}, execFn hlpGetHandler) (valOut interface{}, casOut uint64, errOut error) {
signal := make(chan bool)
signal := make(chan bool, 1)
op, err := execFn(func(bytes []byte, flags uint32, cas uint64, err error) {
go func() {
if err != nil {
Expand Down Expand Up @@ -62,7 +62,7 @@ func (b *Bucket) hlpGetExec(valuePtr interface{}, execFn hlpGetHandler) (valOut
type hlpCasHandler func(ioCasCallback) (pendingOp, error)

func (b *Bucket) hlpCasExec(execFn hlpCasHandler) (casOut uint64, errOut error) {
signal := make(chan bool)
signal := make(chan bool, 1)
op, err := execFn(func(cas uint64, err error) {
go func() {
if err != nil {
Expand All @@ -89,7 +89,7 @@ func (b *Bucket) hlpCasExec(execFn hlpCasHandler) (casOut uint64, errOut error)
type hlpCtrHandler func(ioCtrCallback) (pendingOp, error)

func (b *Bucket) hlpCtrExec(execFn hlpCtrHandler) (valOut uint64, casOut uint64, errOut error) {
signal := make(chan bool)
signal := make(chan bool, 1)
op, err := execFn(func(value uint64, cas uint64, err error) {
go func() {
if err != nil {
Expand Down
5 changes: 3 additions & 2 deletions cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (c *Cluster) OpenBucket(bucket, password string) (*Bucket, error) {
memdHosts = append(memdHosts, fmt.Sprintf("%s:%d", specHost.Host, specHost.Port))
}

authFn := func(srv gocouchbaseio.MemdAuthClient) error {
authFn := func(srv gocouchbaseio.AuthClient) error {
// Build PLAIN auth data
userBuf := []byte(bucket)
passBuf := []byte(password)
Expand All @@ -64,7 +64,8 @@ func (c *Cluster) OpenBucket(bucket, password string) (*Bucket, error) {

return err
}
cli, err := gocouchbaseio.CreateAgent(memdHosts, httpHosts, isSslHosts, authFn)

cli, err := gocouchbaseio.CreateAgent(memdHosts, httpHosts, isSslHosts, nil, authFn)
if err != nil {
return nil, err
}
Expand Down

0 comments on commit 21f169a

Please sign in to comment.