From fd8040e69920ecdad5d47e88bbf3ccfaf5792b91 Mon Sep 17 00:00:00 2001
From: Travis Turner <travis@pilosa.com>
Date: Thu, 22 Mar 2018 16:24:15 -0500
Subject: [PATCH] remove LogOutput and instead close any logger that implements
 io.Closer

---
 server.go        | 8 ++------
 server/server.go | 5 ++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/server.go b/server.go
index 11b2ee2a3..08923f13a 100644
--- a/server.go
+++ b/server.go
@@ -19,8 +19,6 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -87,8 +85,7 @@ type Server struct {
 	// Misc options.
 	MaxWritesPerRequest int
 
-	LogOutput io.Writer
-	Logger    Logger
+	Logger Logger
 
 	defaultClient InternalClient
 }
@@ -115,8 +112,7 @@ func NewServer() *Server {
 		MetricInterval:      0,
 		DiagnosticInterval:  0,
 
-		LogOutput: ioutil.Discard,
-		Logger:    NopLogger,
+		Logger: NopLogger,
 	}
 
 	s.Handler.Holder = s.Holder
diff --git a/server/server.go b/server/server.go
index 8fe508fbd..2dcfd12f4 100644
--- a/server/server.go
+++ b/server/server.go
@@ -134,7 +134,6 @@ func (m *Command) SetupServer() error {
 	if err != nil {
 		return err
 	}
-	m.Server.LogOutput = lw
 	m.logger = log.New(lw, "", log.LstdFlags)
 	if m.Config.Verbose {
 		m.Server.Logger = pilosa.NewVerboseLogger(m.logger)
@@ -299,8 +298,8 @@ func GetLogWriter(path string, defaultWriter io.Writer) (io.Writer, error) {
 func (m *Command) Close() error {
 	var logErr error
 	serveErr := m.Server.Close()
-	logOutput := m.Server.LogOutput
-	if closer, ok := logOutput.(io.Closer); ok {
+	logger := m.Server.Logger
+	if closer, ok := logger.(io.Closer); ok {
 		logErr = closer.Close()
 	}
 	close(m.Done)