From a24ac88b0157fda12ccb91bb5c0d9c1fe8e93043 Mon Sep 17 00:00:00 2001 From: Sssilencee Date: Thu, 5 Oct 2023 16:22:53 +0400 Subject: [PATCH] log level fix & custom transport fixes --- e2e/cli.go | 3 ++- pkg/drivers/http/driver.go | 5 ++++- pkg/drivers/http/options.go | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/e2e/cli.go b/e2e/cli.go index 2383882f..5c050579 100644 --- a/e2e/cli.go +++ b/e2e/cli.go @@ -13,6 +13,7 @@ import ( "path/filepath" rt "runtime" "runtime/pprof" + "strconv" "strings" "time" @@ -222,7 +223,7 @@ var ( logLevel = flag.String( "log-level", - logging.ErrorLevel.String(), + strconv.Itoa(logging.ErrorLevel), "log level", ) ) diff --git a/pkg/drivers/http/driver.go b/pkg/drivers/http/driver.go index 4991689f..1ca403ae 100644 --- a/pkg/drivers/http/driver.go +++ b/pkg/drivers/http/driver.go @@ -81,7 +81,10 @@ func addProxy(httpClient *pester.Client, proxyStr string) error { proxy := http.ProxyURL(proxyURL) if httpClient.Transport != nil { - httpClient.Transport.(*http.Transport).Proxy = proxy + transport, isHTTPTransport := httpClient.Transport.(*http.Transport) + if isHTTPTransport { + transport.Proxy = proxy + } return nil } diff --git a/pkg/drivers/http/options.go b/pkg/drivers/http/options.go index d51e6ef6..8866c308 100644 --- a/pkg/drivers/http/options.go +++ b/pkg/drivers/http/options.go @@ -31,7 +31,7 @@ type ( Concurrency int BodyLimit int64 HTTPCodesFilter []compiledStatusCodeFilter - HTTPTransport *stdhttp.Transport + HTTPTransport stdhttp.RoundTripper Timeout time.Duration MaxRedirectsLimit uint8 } @@ -144,7 +144,7 @@ func WithAllowedHTTPCodes(httpCodes []int) Option { } } -func WithCustomTransport(transport *stdhttp.Transport) Option { +func WithCustomTransport(transport stdhttp.RoundTripper) Option { return func(opts *Options) { opts.HTTPTransport = transport }