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

Refactor ensurePath to util

This commit is contained in:
Armon Dadgar 2013-12-19 14:18:55 -08:00
parent d0cfb06d74
commit ee7f13b205
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
consul/server.go
View File

@ -141,14 +141,6 @@ func NewServer(config *Config) (*Server, error) {
return s, nil return s, nil
} }
// ensurePath is used to make sure a path exists
func (s *Server) ensurePath(path string, dir bool) error {
if !dir {
path = filepath.Dir(path)
}
return os.MkdirAll(path, 0755)
}
// setupSerf is used to setup and initialize a Serf // setupSerf is used to setup and initialize a Serf
func (s *Server) setupSerf(conf *serf.Config, ch chan serf.Event, path string) (*serf.Serf, error) { func (s *Server) setupSerf(conf *serf.Config, ch chan serf.Event, path string) (*serf.Serf, error) {
addr := s.rpcListener.Addr().(*net.TCPAddr) addr := s.rpcListener.Addr().(*net.TCPAddr)
@ -158,7 +150,7 @@ func (s *Server) setupSerf(conf *serf.Config, ch chan serf.Event, path string) (
conf.LogOutput = s.config.LogOutput conf.LogOutput = s.config.LogOutput
conf.EventCh = ch conf.EventCh = ch
conf.SnapshotPath = filepath.Join(s.config.DataDir, path) conf.SnapshotPath = filepath.Join(s.config.DataDir, path)
if err := s.ensurePath(conf.SnapshotPath, false); err != nil { if err := ensurePath(conf.SnapshotPath, false); err != nil {
return nil, err return nil, err
} }
return serf.Create(conf) return serf.Create(conf)
@ -168,7 +160,7 @@ func (s *Server) setupSerf(conf *serf.Config, ch chan serf.Event, path string) (
func (s *Server) setupRaft() error { func (s *Server) setupRaft() error {
// Create the base path // Create the base path
path := filepath.Join(s.config.DataDir, raftState) path := filepath.Join(s.config.DataDir, raftState)
if err := s.ensurePath(path, true); err != nil { if err := ensurePath(path, true); err != nil {
return err return err
} }

13
consul/util.go
View File

@ -1,5 +1,10 @@
package consul package consul
import (
"os"
"path/filepath"
)
// strContains checks if a list contains a string // strContains checks if a list contains a string
func strContains(l []string, s string) bool { func strContains(l []string, s string) bool {
for _, v := range l { for _, v := range l {
@ -9,3 +14,11 @@ func strContains(l []string, s string) bool {
} }
return false return false
} }
// ensurePath is used to make sure a path exists
func ensurePath(path string, dir bool) error {
if !dir {
path = filepath.Dir(path)
}
return os.MkdirAll(path, 0755)
}