dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use timeout smaller than 10 seconds 

closes #959
This commit is contained in:
Pierre Fersing 2016-04-04 11:59:28 +02:00 committed by Cameron Sparr
parent 8509101b83
commit 5fe8903fd2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/inputs/mongodb/mongodb.go
View File

@ -103,7 +103,7 @@ func (m *MongoDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
dialAddrs[0], err.Error()) dialAddrs[0], err.Error())
} }
dialInfo.Direct = true dialInfo.Direct = true
dialInfo.Timeout = time.Duration(10) * time.Second dialInfo.Timeout = 5 * time.Second
if m.Ssl.Enabled { if m.Ssl.Enabled {
tlsConfig := &tls.Config{} tlsConfig := &tls.Config{}

2
plugins/inputs/mongodb/mongodb_test.go
View File

@ -43,7 +43,7 @@ func testSetup(m *testing.M) {
log.Fatalf("Unable to parse URL (%s), %s\n", dialAddrs[0], err.Error()) log.Fatalf("Unable to parse URL (%s), %s\n", dialAddrs[0], err.Error())
} }
dialInfo.Direct = true dialInfo.Direct = true
dialInfo.Timeout = time.Duration(10) * time.Second dialInfo.Timeout = 5 * time.Second
sess, err := mgo.DialWithInfo(dialInfo) sess, err := mgo.DialWithInfo(dialInfo)
if err != nil { if err != nil {
log.Fatalf("Unable to connect to MongoDB, %s\n", err.Error()) log.Fatalf("Unable to connect to MongoDB, %s\n", err.Error())

4
plugins/inputs/prometheus/prometheus.go
View File

@ -80,10 +80,10 @@ func (p *Prometheus) gatherURL(url string, acc telegraf.Accumulator) error {
var rt http.RoundTripper = &http.Transport{ var rt http.RoundTripper = &http.Transport{
Dial: (&net.Dialer{ Dial: (&net.Dialer{
Timeout: 10 * time.Second, Timeout: 5 * time.Second,
KeepAlive: 30 * time.Second, KeepAlive: 30 * time.Second,
}).Dial, }).Dial,
TLSHandshakeTimeout: 10 * time.Second, TLSHandshakeTimeout: 5 * time.Second,
TLSClientConfig: &tls.Config{ TLSClientConfig: &tls.Config{
InsecureSkipVerify: p.InsecureSkipVerify, InsecureSkipVerify: p.InsecureSkipVerify,
}, },