diff --git a/ctl/backup_test.go b/ctl/backup_test.go index 936576704..512093a20 100644 --- a/ctl/backup_test.go +++ b/ctl/backup_test.go @@ -23,7 +23,6 @@ import ( "io/ioutil" "net/http/httptest" "net/url" - "os" "testing" ) @@ -191,7 +190,7 @@ func NewHolder() *Holder { // MustOpenHolder creates and opens a holder at a temporary path. Panic on error. func MustOpenHolder() *Holder { h := NewHolder() - if err := h.Open(os.Stderr); err != nil { + if err := h.Open(); err != nil { panic(err) } return h diff --git a/holder.go b/holder.go index 854d778ef..2fdb58e97 100644 --- a/holder.go +++ b/holder.go @@ -70,7 +70,7 @@ func NewHolder() *Holder { } // Open initializes the root data directory for the holder. -func (h *Holder) Open(logOutput io.Writer) error { +func (h *Holder) Open() error { if err := os.MkdirAll(h.Path, 0777); err != nil { return err } @@ -87,8 +87,6 @@ func (h *Holder) Open(logOutput io.Writer) error { return err } - h.LogOutput = logOutput - for _, fi := range fis { if !fi.IsDir() { continue diff --git a/holder_test.go b/holder_test.go index 78a9219b3..b6864ffc9 100644 --- a/holder_test.go +++ b/holder_test.go @@ -417,7 +417,7 @@ func NewHolder() *Holder { // MustOpenHolder creates and opens a holder at a temporary path. Panic on error. func MustOpenHolder() *Holder { h := NewHolder() - if err := h.Open(&h.LogOutput); err != nil { + if err := h.Open(); err != nil { panic(err) } return h @@ -439,7 +439,7 @@ func (h *Holder) Reopen() error { h.Holder = pilosa.NewHolder() h.Holder.Path = path h.Holder.LogOutput = logOutput - if err := h.Holder.Open(&h.LogOutput); err != nil { + if err := h.Holder.Open(); err != nil { return err } diff --git a/server.go b/server.go index 265a400f5..1f09119e1 100644 --- a/server.go +++ b/server.go @@ -129,7 +129,8 @@ func (s *Server) Open() error { } // Open holder. - if err := s.Holder.Open(s.LogOutput); err != nil { + s.Holder.LogOutput = s.LogOutput + if err := s.Holder.Open(); err != nil { return fmt.Errorf("opening Holder: %v", err) }