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

Merge pull request #4315 from hashicorp/bugfix/fix-server-enterprise 

Move starting enterprise functionality
This commit is contained in:
Matt Keeler 2018-07-02 12:28:10 -04:00 committed by GitHub
parent 81fd20a4d3 02719c52ff
commit ad40be86d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
agent/consul/server.go
View File

@ -358,12 +358,6 @@ func NewServerLogger(config *Config, logger *log.Logger, tokens *token.Store) (*
return nil, fmt.Errorf("Failed to start Raft: %v", err) return nil, fmt.Errorf("Failed to start Raft: %v", err)
} }
// Start enterprise specific functionality
if err := s.startEnterprise(); err != nil {
s.Shutdown()
return nil, err
}
// Serf and dynamic bind ports // Serf and dynamic bind ports
// //
// The LAN serf cluster announces the port of the WAN serf cluster // The LAN serf cluster announces the port of the WAN serf cluster
@ -427,6 +421,12 @@ func NewServerLogger(config *Config, logger *log.Logger, tokens *token.Store) (*
} }
go s.Flood(nil, portFn, s.serfWAN) go s.Flood(nil, portFn, s.serfWAN)
} }
// Start enterprise specific functionality
if err := s.startEnterprise(); err != nil {
s.Shutdown()
return nil, err
}
// Start monitoring leadership. This must happen after Serf is set up // Start monitoring leadership. This must happen after Serf is set up
// since it can fire events when leadership is obtained. // since it can fire events when leadership is obtained.