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

consul: start RPC after fully initialized. Fixes #160

This commit is contained in:
Armon Dadgar 2014-06-11 09:46:44 -07:00
parent ab4e3de185
commit 938371ee40
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
consul/server.go
View File

@ -177,12 +177,6 @@ func NewServer(config *Config) (*Server, error) {
shutdownCh: make(chan struct{}), shutdownCh: make(chan struct{}),
} }
// Initialize the RPC layer
if err := s.setupRPC(tlsConfig); err != nil {
s.Shutdown()
return nil, fmt.Errorf("Failed to start RPC layer: %v", err)
}
// Initialize the Raft server // Initialize the Raft server
if err := s.setupRaft(); err != nil { if err := s.setupRaft(); err != nil {
s.Shutdown() s.Shutdown()
@ -209,6 +203,12 @@ func NewServer(config *Config) (*Server, error) {
return nil, fmt.Errorf("Failed to start wan serf: %v", err) return nil, fmt.Errorf("Failed to start wan serf: %v", err)
} }
// Initialize the RPC layer
if err := s.setupRPC(tlsConfig); err != nil {
s.Shutdown()
return nil, fmt.Errorf("Failed to start RPC layer: %v", err)
}
return s, nil return s, nil
} }