nune/gitea
nune/gitea
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Backport: Use vendored go-swagger (#8087) (#8165)

Browse source 
* Use vendored go-swagger (#8087)

* Use vendored go-swagger

* vendor go-swagger

* revert un wanteed change

* remove un-needed GO111MODULE

* Update Makefile

Co-Authored-By: techknowlogick <matti@mdranta.net>

* re-generate swagger file
This commit is contained in:
Antoine GIRARD 2019-09-12 21:58:09 +02:00 • committed by Lauris BH
parent 2f71571305
commit c4d8d53a6d
918 changed files with 168225 additions and 9462 deletions
Download patch file Download diff file Expand all files Collapse all files

38
vendor/github.com/couchbaselabs/go-couchbase/streaming.go generated vendored
View file

@ -88,6 +88,16 @@ func (b *Bucket) UpdateBucket() error {
var failures int
var returnErr error
var poolServices PoolServices
var err error
tlsConfig := b.pool.client.tlsConfig
if tlsConfig != nil {
poolServices, err = b.pool.client.GetPoolServices("default")
if err != nil {
return err
}
}
for {
if failures == MAX_RETRY_COUNT {
@ -110,15 +120,6 @@ func (b *Bucket) UpdateBucket() error {
return err
}
b.RLock()
pool := b.pool
bucketName := b.Name
b.RUnlock()
scopes, err := getScopesAndCollections(pool, bucketName)
if err != nil {
return err
}
// Lock here to avoid having pool closed under us.
b.RLock()
err = maybeAddAuth(req, b.pool.client.ah)
@ -176,16 +177,22 @@ func (b *Bucket) UpdateBucket() error {
continue
}
// else create a new pool
hostport := tmpb.VBSMJson.ServerList[i]
if tlsConfig != nil {
hostport, err = MapKVtoSSL(hostport, &poolServices)
if err != nil {
b.Unlock()
return err
}
}
if b.ah != nil {
newcps[i] = newConnectionPool(
tmpb.VBSMJson.ServerList[i],
b.ah, false, PoolSize, PoolOverflow)
newcps[i] = newConnectionPool(hostport,
b.ah, false, PoolSize, PoolOverflow, b.pool.client.tlsConfig, b.Name)
} else {
newcps[i] = newConnectionPool(
tmpb.VBSMJson.ServerList[i],
newcps[i] = newConnectionPool(hostport,
b.authHandler(true /* bucket already locked */),
false, PoolSize, PoolOverflow)
false, PoolSize, PoolOverflow, b.pool.client.tlsConfig, b.Name)
}
}
@ -194,7 +201,6 @@ func (b *Bucket) UpdateBucket() error {
tmpb.ah = b.ah
b.vBucketServerMap = unsafe.Pointer(&tmpb.VBSMJson)
b.nodeList = unsafe.Pointer(&tmpb.NodesJSON)
b.Scopes = scopes
b.Unlock()
logging.Infof("Got new configuration for bucket %s", b.GetName())