From 3762df8087d96be47e52bd6c0a27f160d0e91608 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Sat, 22 Aug 2020 20:07:09 +0800 Subject: [PATCH] fix: GetDefaultClient always return a new http client instance --- pkg/cloudcommon/informer/etcd.go | 2 +- pkg/util/httputils/httputils.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cloudcommon/informer/etcd.go b/pkg/cloudcommon/informer/etcd.go index 497ad1d9d9..3967a7122d 100644 --- a/pkg/cloudcommon/informer/etcd.go +++ b/pkg/cloudcommon/informer/etcd.go @@ -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 diff --git a/pkg/util/httputils/httputils.go b/pkg/util/httputils/httputils.go index a78a06d7d0..cc47684f5a 100644 --- a/pkg/util/httputils/httputils.go +++ b/pkg/util/httputils/httputils.go @@ -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) {