unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

Merge pull request #221 from gaxxx/master

Browse Source 
add https support for consul
This commit is contained in:
Asim Aslam 2017-11-28 07:11:48 +00:00 committed by GitHub
commit c82dadfa55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
registry/consul_registry.go
View File

@ -59,14 +59,6 @@ func newConsulRegistry(opts ...Option) Registry {
config = c config = c
} }
} }
if config.HttpClient == nil {
config.HttpClient = new(http.Client)
}
// set timeout
if options.Timeout > 0 {
config.HttpClient.Timeout = options.Timeout
}
// check if there are any addrs // check if there are any addrs
if len(options.Addrs) > 0 { if len(options.Addrs) > 0 {
@ -82,6 +74,10 @@ func newConsulRegistry(opts ...Option) Registry {
// requires secure connection? // requires secure connection?
if options.Secure || options.TLSConfig != nil { if options.Secure || options.TLSConfig != nil {
if config.HttpClient == nil {
config.HttpClient = new(http.Client)
}
config.Scheme = "https" config.Scheme = "https"
// We're going to support InsecureSkipVerify // We're going to support InsecureSkipVerify
config.HttpClient.Transport = newTransport(options.TLSConfig) config.HttpClient.Transport = newTransport(options.TLSConfig)
@ -90,6 +86,11 @@ func newConsulRegistry(opts ...Option) Registry {
// create the client // create the client
client, _ := consul.NewClient(config) client, _ := consul.NewClient(config)
// set timeout
if options.Timeout > 0 {
config.HttpClient.Timeout = options.Timeout
}
cr := &consulRegistry{ cr := &consulRegistry{
Address: config.Address, Address: config.Address,
Client: client, Client: client,