mirror of
https://github.com/grafana/grafana.git
synced 2024-11-26 19:00:54 -06:00
a6b2e1865c
Make sure that default timeout settings are based on configuration parameters. This now applies for core data sources using old TSDB contracts and new SDK contracts. Before it was only applied for old TSDB contracts. Also moves global setting variables to non-global (setting.Cfg).
25 lines
1.2 KiB
Go
25 lines
1.2 KiB
Go
package setting
|
|
|
|
import "gopkg.in/ini.v1"
|
|
|
|
func readDataProxySettings(iniFile *ini.File, cfg *Cfg) error {
|
|
dataproxy := iniFile.Section("dataproxy")
|
|
cfg.SendUserHeader = dataproxy.Key("send_user_header").MustBool(false)
|
|
cfg.DataProxyLogging = dataproxy.Key("logging").MustBool(false)
|
|
cfg.DataProxyTimeout = dataproxy.Key("timeout").MustInt(10)
|
|
cfg.DataProxyDialTimeout = dataproxy.Key("dialTimeout").MustInt(30)
|
|
cfg.DataProxyKeepAlive = dataproxy.Key("keep_alive_seconds").MustInt(30)
|
|
cfg.DataProxyTLSHandshakeTimeout = dataproxy.Key("tls_handshake_timeout_seconds").MustInt(10)
|
|
cfg.DataProxyExpectContinueTimeout = dataproxy.Key("expect_continue_timeout_seconds").MustInt(1)
|
|
cfg.DataProxyMaxConnsPerHost = dataproxy.Key("max_conns_per_host").MustInt(0)
|
|
cfg.DataProxyMaxIdleConns = dataproxy.Key("max_idle_connections").MustInt()
|
|
cfg.DataProxyIdleConnTimeout = dataproxy.Key("idle_conn_timeout_seconds").MustInt(90)
|
|
|
|
if val, err := dataproxy.Key("max_idle_connections_per_host").Int(); err == nil {
|
|
cfg.Logger.Warn("[Deprecated] the configuration setting 'max_idle_connections_per_host' is deprecated, please use 'max_idle_connections' instead")
|
|
cfg.DataProxyMaxIdleConns = val
|
|
}
|
|
|
|
return nil
|
|
}
|