unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions 1 Packages Projects Releases 331 Wiki Activity

Merge pull request #197 from sarbash/fix-tls-consul-registry

Browse Source 
Check for uninitialized *config.HttpClient
This commit is contained in:
Asim Aslam
2017-08-15 08:51:50 +01:00
committed by GitHub
parent 87c39542b0 db0df07fd6
commit 8078234e58
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
registry/consul_registry.go
View File

@@ -59,6 +59,9 @@ func newConsulRegistry(opts ...Option) Registry {
config = c config = c
} }
} }
if config.HttpClient == nil {
config.HttpClient = new(http.Client)
}
// set timeout // set timeout
if options.Timeout > 0 { if options.Timeout > 0 {
@@ -81,9 +84,6 @@ func newConsulRegistry(opts ...Option) Registry {
if options.Secure || options.TLSConfig != nil { if options.Secure || options.TLSConfig != nil {
config.Scheme = "https" config.Scheme = "https"
// We're going to support InsecureSkipVerify // We're going to support InsecureSkipVerify
if config.HttpClient == nil {
config.HttpClient = new(http.Client)
}
config.HttpClient.Transport = newTransport(options.TLSConfig) config.HttpClient.Transport = newTransport(options.TLSConfig)
} }