Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit f827263

Browse files
Merge pull request #1355 from IRCody/transport
Adds IdleConnTimeout to transport in client
2 parents 1230806 + aa0a28c commit f827263

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.travis.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
sudo: false
22
language: go
33
go:
4-
- 1.6.3
5-
- 1.7.1
4+
- 1.7.3
65
before_install:
76
- bash scripts/gitcookie.sh
87
- go get github.com/smartystreets/goconvey/convey
@@ -16,10 +15,6 @@ env:
1615
- SNAP_TEST_TYPE=small
1716
- SNAP_TEST_TYPE=medium
1817
- SNAP_TEST_TYPE=build
19-
matrix:
20-
exclude:
21-
- go: 1.6.3
22-
env: SNAP_TEST_TYPE=build
2318
install:
2419
- export TMPDIR=$HOME/tmp
2520
- mkdir -p $TMPDIR
@@ -48,7 +43,7 @@ deploy:
4843
on:
4944
repo: intelsdi-x/snap
5045
branch: master
51-
condition: $SNAP_TEST_TYPE = build && $TRAVIS_GO_VERSION = "1.7.1"
46+
condition: $SNAP_TEST_TYPE = build && $TRAVIS_GO_VERSION = "1.7.3"
5247
- provider: s3
5348
access_key_id: AKIAINMB43VSSPFZISAA
5449
secret_access_key:
@@ -62,4 +57,4 @@ deploy:
6257
on:
6358
repo: intelsdi-x/snap
6459
tags: true
65-
condition: $SNAP_TEST_TYPE = build && $TRAVIS_GO_VERSION = "1.7.1"
60+
condition: $SNAP_TEST_TYPE = build && $TRAVIS_GO_VERSION = "1.7.3"

mgmt/rest/client/client.go

+3
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"os"
3535
"path/filepath"
3636
"strings"
37+
"time"
3738

3839
"github.com/asaskevich/govalidator"
3940

@@ -104,9 +105,11 @@ func Username(u string) metaOp {
104105
var (
105106
secureTransport = &http.Transport{
106107
TLSClientConfig: &tls.Config{InsecureSkipVerify: false},
108+
IdleConnTimeout: time.Second,
107109
}
108110
insecureTransport = &http.Transport{
109111
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
112+
IdleConnTimeout: time.Second,
110113
}
111114
)
112115

0 commit comments

Comments
 (0)