status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge error

This commit is contained in:
Paul Banks 2018-06-20 16:44:24 +01:00 committed by Jack Pearkes
parent 17789d4fe3
commit 3a6024e1b0
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
connect/proxy/proxy.go
View File

@ -73,13 +73,8 @@ func (p *Proxy) Serve() error {
tcfg := service.ServerTLSConfig()
cert, _ := tcfg.GetCertificate(nil)
leaf, _ := x509.ParseCertificate(cert.Certificate[0])
<<<<<<< HEAD
p.logger.Printf("[DEBUG] leaf: %s roots: %s", leaf.URIs[0],
bytes.Join(tcfg.RootCAs.Subjects(), []byte(",")))
}()
=======
p.logger.Printf("[DEBUG] leaf: %s roots: %s", leaf.URIs[0], bytes.Join(tcfg.RootCAs.Subjects(), []byte(",")))
>>>>>>> Make proxy only listen after initial certs are fetched
// Only start a listener if we have a port set. This allows
// the configuration to disable our public listener.