luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

move logic to determine whether to reload tls configuration to tlsutil helper

This commit is contained in:
Chelsea Holland Komlo 2018-06-08 14:33:58 -04:00
parent 3b5d5c7be8
commit de03ce8070
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
helper/tlsutil/config.go
View File

@ -421,3 +421,25 @@ func ParseMinVersion(version string) (uint16, error) {
return vers, nil return vers, nil
} }
func ShouldReloadRPCConnections(old, new *config.TLSConfig) (bool, error) {
var tlsInfoEqual bool
// If already configured with TLS, compare with the new TLS configuration
if new != nil {
var err error
tlsInfoEqual, err = new.CertificateInfoIsEqual(old)
if err != nil {
return false, err
}
} else {
// If not configured with TLS, compare with the new TLS configuration
tlsInfoEqual = new == nil && old == nil
}
if new != nil && old != nil {
tlsInfoEqual = new.EnableRPC == old.EnableRPC
}
return tlsInfoEqual, nil
}

7
nomad/server.go
View File

@ -678,13 +678,12 @@ func (s *Server) Reload(newConfig *Config) error {
} }
} }
tlsInfoEqual, err := newConfig.TLSConfig.CertificateInfoIsEqual(s.config.TLSConfig) shouldReloadTLS, err := tlsutil.ShouldReloadRPCConnections(s.config.TLSConfig, newConfig.TLSConfig)
if err != nil { if err != nil {
s.logger.Printf("[ERR] nomad: error parsing server TLS configuration: %s", err) s.logger.Printf("[ERR] nomad: error checking whether to reload TLS configuration: %s", err)
return err
} }
if !tlsInfoEqual || newConfig.TLSConfig.EnableRPC != s.config.TLSConfig.EnableRPC { if shouldReloadTLS {
if err := s.reloadTLSConnections(newConfig.TLSConfig); err != nil { if err := s.reloadTLSConnections(newConfig.TLSConfig); err != nil {
s.logger.Printf("[ERR] nomad: error reloading server TLS configuration: %s", err) s.logger.Printf("[ERR] nomad: error reloading server TLS configuration: %s", err)
multierror.Append(&mErr, err) multierror.Append(&mErr, err)