From 855f224778c306d361e49df5b215aa84c6019ea2 Mon Sep 17 00:00:00 2001 From: Alan Bernstein Date: Fri, 23 Jun 2017 18:14:59 -0500 Subject: [PATCH] Pass logOutput to Holder.Open --- holder.go | 4 +++- server.go | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/holder.go b/holder.go index 2fdb58e97..854d778ef 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() error { +func (h *Holder) Open(logOutput io.Writer) error { if err := os.MkdirAll(h.Path, 0777); err != nil { return err } @@ -87,6 +87,8 @@ func (h *Holder) Open() error { return err } + h.LogOutput = logOutput + for _, fi := range fis { if !fi.IsDir() { continue diff --git a/server.go b/server.go index 6154ed3e1..265a400f5 100644 --- a/server.go +++ b/server.go @@ -129,7 +129,7 @@ func (s *Server) Open() error { } // Open holder. - if err := s.Holder.Open(); err != nil { + if err := s.Holder.Open(s.LogOutput); err != nil { return fmt.Errorf("opening Holder: %v", err) } @@ -159,7 +159,6 @@ func (s *Server) Open() error { // Initialize Holder. s.Holder.Broadcaster = s.Broadcaster - s.Holder.LogOutput = s.LogOutput // Serve HTTP. go func() { http.Serve(ln, s.Handler) }()