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

Remove an unnecessary else

This commit is contained in:
Daniel Nephin 2020-12-23 13:13:49 -05:00
parent 4b8b2a4291
commit a04cefaa28
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
agent/agent.go
View File

@ -658,14 +658,14 @@ func (a *Agent) listenAndServeGRPC() error {
AuthCheckFrequency: xds.DefaultAuthCheckFrequency, AuthCheckFrequency: xds.DefaultAuthCheckFrequency,
} }
var err error tlsConfig := a.tlsConfigurator
if a.config.HTTPSPort > 0 { // gRPC uses the same TLS settings as the HTTPS API. If HTTPS is not enabled
// gRPC uses the same TLS settings as the HTTPS API. If HTTPS is // then gRPC should not use TLS.
// enabled then gRPC will require HTTPS as well. if a.config.HTTPSPort <= 0 {
a.grpcServer, err = xdsServer.GRPCServer(a.tlsConfigurator) tlsConfig = nil
} else {
a.grpcServer, err = xdsServer.GRPCServer(nil)
} }
var err error
a.grpcServer, err = xdsServer.GRPCServer(tlsConfig)
if err != nil { if err != nil {
return err return err
} }