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

remove code duplication

This commit is contained in:
Chelsea Holland Komlo 2017-11-28 17:25:16 -05:00
parent 4e0dbd23cf
commit 9b0a7a7f7c
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
nomad/server.go
View File

@ -237,22 +237,8 @@ func NewServer(config *Config, consulCatalog consul.CatalogAPI, logger *log.Logg
}
// Configure TLS
var tlsWrap tlsutil.RegionWrapper
var incomingTLS *tls.Config
if config.TLSConfig.EnableRPC {
tlsConf := config.tlsConfig()
tw, err := tlsConf.OutgoingTLSWrapper()
if err != nil {
return nil, err
}
tlsWrap = tw
itls, err := tlsConf.IncomingTLSConfig()
if err != nil {
return nil, err
}
incomingTLS = itls
}
tlsConf := config.tlsConfig()
incomingTLS, tlsWrap, err := getTLSConf(config.TLSConfig.EnableRPC, tlsConf)
// Create the ACL object cache
aclCache, err := lru.New2Q(aclCacheSize)
@ -366,6 +352,25 @@ func NewServer(config *Config, consulCatalog consul.CatalogAPI, logger *log.Logg
return s, nil
}
func getTLSConf(enableRPC bool, tlsConf *tlsutil.Config) (*tls.Config, tlsutil.RegionWrapper, error) {
var tlsWrap tlsutil.RegionWrapper
var incomingTLS *tls.Config
if enableRPC {
tw, err := tlsConf.OutgoingTLSWrapper()
if err != nil {
return nil, nil, err
}
tlsWrap = tw
itls, err := tlsConf.IncomingTLSConfig()
if err != nil {
return nil, nil, err
}
incomingTLS = itls
}
return incomingTLS, tlsWrap, nil
}
// ReloadTLSConnections updates a server's TLS configuration and reloads RPC
// connections
func (s *Server) ReloadTLSConnections(newTLSConfig *config.TLSConfig) error {
@ -375,22 +380,8 @@ func (s *Server) ReloadTLSConnections(newTLSConfig *config.TLSConfig) error {
s.config.TLSConfig = newTLSConfig
s.configLock.Unlock()
var tlsWrap tlsutil.RegionWrapper
var incomingTLS *tls.Config
if s.config.TLSConfig.EnableRPC {
tlsConf := s.config.tlsConfig()
tw, err := tlsConf.OutgoingTLSWrapper()
if err != nil {
return err
}
tlsWrap = tw
itls, err := tlsConf.IncomingTLSConfig()
if err != nil {
return err
}
incomingTLS = itls
}
tlsConf := s.config.tlsConfig()
incomingTLS, tlsWrap, err := getTLSConf(s.config.TLSConfig.EnableRPC, tlsConf)
if s.rpcCancel == nil {
s.logger.Printf("[ERR] nomad: No TLS Context to reset")