IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

revert ds_proxy timeout and implement dataproxy timeout correctly

Browse Source
This commit is contained in:
Marcus Efraimsson 2019-02-11 13:42:05 +01:00
parent 1b22ceabbe
commit a1cd550df4
No known key found for this signature in database
GPG Key ID: EBFE0FB04612DD4A
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/pluginproxy/ds_proxy.go
View File

@ -54,7 +54,7 @@ func NewDataSourceProxy(ds *m.DataSource, plugin *plugins.DataSourcePlugin, ctx
func newHTTPClient() httpClient { func newHTTPClient() httpClient {
return &http.Client{ return &http.Client{
Timeout: time.Duration(setting.DataProxyTimeout) * time.Second, Timeout: 30 * time.Second,
Transport: &http.Transport{Proxy: http.ProxyFromEnvironment}, Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
} }
} }

4
pkg/models/datasource_cache.go
View File

@ -8,6 +8,8 @@ import (
"net/http" "net/http"
"sync" "sync"
"time" "time"
"github.com/grafana/grafana/pkg/setting"
) )
type proxyTransportCache struct { type proxyTransportCache struct {
@ -57,7 +59,7 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
TLSClientConfig: tlsConfig, TLSClientConfig: tlsConfig,
Proxy: http.ProxyFromEnvironment, Proxy: http.ProxyFromEnvironment,
Dial: (&net.Dialer{ Dial: (&net.Dialer{
Timeout: 30 * time.Second, Timeout: time.Duration(setting.DataProxyTimeout) * time.Second,
KeepAlive: 30 * time.Second, KeepAlive: 30 * time.Second,
DualStack: true, DualStack: true,
}).Dial, }).Dial,