Micro improvements on connection handling.

This commit is contained in:
2023-12-13 22:44:57 +00:00
parent a107ee953b
commit 29afbd08fd
2 changed files with 12 additions and 4 deletions
+7 -3
View File
@@ -45,8 +45,13 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) {
qe.Logger.Debug("Error while executing http request", map[string]interface{}{"error": err.Error()}) qe.Logger.Debug("Error while executing http request", map[string]interface{}{"error": err.Error()})
return err return err
} }
defer io.Copy(io.Discard, httpResponse.Body) defer func() {
defer httpResponse.Body.Close() _, err := io.Copy(io.Discard, httpResponse.Body)
if err != nil {
qe.Logger.Debug("Error while discarding http response body;", map[string]interface{}{"error": err.Error()})
}
httpResponse.Body.Close()
}()
if httpResponse.StatusCode < 200 || httpResponse.StatusCode >= 204 { if httpResponse.StatusCode < 200 || httpResponse.StatusCode >= 204 {
return fmt.Errorf("HTTP error - unacceptable status code: \"%s\" for \"%s\"", httpResponse.Status, httpRequest.URL) return fmt.Errorf("HTTP error - unacceptable status code: \"%s\" for \"%s\"", httpResponse.Status, httpRequest.URL)
@@ -63,7 +68,6 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) {
qe.Logger.Debug("Error while unmarshalling http response;", map[string]interface{}{"error": err.Error()}) qe.Logger.Debug("Error while unmarshalling http response;", map[string]interface{}{"error": err.Error()})
return fmt.Errorf("Error while unmarshalling http response: %s", err.Error()) return fmt.Errorf("Error while unmarshalling http response: %s", err.Error())
} }
return nil return nil
}, },
retry.OnRetry(func(n uint, err error) { retry.OnRetry(func(n uint, err error) {
+5 -1
View File
@@ -11,14 +11,18 @@ import (
func (b *BaseClient) createHttpClient() (http_client *http.Client) { func (b *BaseClient) createHttpClient() (http_client *http.Client) {
httpTransport := &http.Transport{ httpTransport := &http.Transport{
MaxIdleConns: 10, MaxIdleConns: 512,
MaxConnsPerHost: 512,
MaxIdleConnsPerHost: 512,
IdleConnTimeout: 15 * time.Second, IdleConnTimeout: 15 * time.Second,
ResponseHeaderTimeout: 15 * time.Second, ResponseHeaderTimeout: 15 * time.Second,
DisableKeepAlives: false, DisableKeepAlives: false,
DisableCompression: false,
} }
if strings.HasPrefix(b.endpoint, "http://") { if strings.HasPrefix(b.endpoint, "http://") {
http_client = &http.Client{ http_client = &http.Client{
Timeout: 15 * time.Second,
Transport: httpTransport, Transport: httpTransport,
CheckRedirect: func(req *http.Request, via []*http.Request) error { CheckRedirect: func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse return http.ErrUseLastResponse