opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7615 from swordqiu/hotfix/qj-get-default-http-client-always-new-instance

Browse Source 
fix: GetDefaultClient always return a new http client instance
This commit is contained in:
Zexi Li
2020-08-24 22:17:41 +08:00
committed by GitHub
parent a4b27a3cf3 3762df8087
commit 479d7e2be1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/informer/etcd.go
+1 -1
View File
@@ -215,7 +215,7 @@ func (b *EtcdBackend) shouldDeleteWatchedResource(ctx context.Context, keywordPl
clientsKey := fmt.Sprintf("/%s/%s", keywordPlural, EtcdInformerClientsKey)
pairs, err := b.client.List(ctx, clientsKey)
if err != nil {
log.Errorf("list clientsKey %s error: %v", err)
log.Errorf("list clientsKey %s error: %v", clientsKey, err)
return false
}
return len(pairs) == 0
pkg/util/httputils/httputils.go
+2 -2
View File
@@ -411,11 +411,11 @@ func GetAdaptiveTimeoutClient() *http.Client {
var defaultHttpClient *http.Client
func init() {
defaultHttpClient = GetClient(true, time.Second*15)
defaultHttpClient = GetDefaultClient()
}
func GetDefaultClient() *http.Client {
return defaultHttpClient
return GetClient(true, time.Second*15)
}
func Request(client *http.Client, ctx context.Context, method THttpMethod, urlStr string, header http.Header, body io.Reader, debug bool) (*http.Response, error) {