Clearer writer name

Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>

commands/config.go

@@ -12,7 +12,7 @@ import (
 func cmdConfig(c CommandLine, api libmachine.API) error {
 	// Ensure that log messages always go to stderr when this command is
 	// being run (it is intended to be run in a subshell)
-	log.SetOut(os.Stderr)
+	log.SetOutWriter(os.Stderr)
 
 	if len(c.Args()) != 1 {
 		return ErrExpectedOneMachine

commands/env.go

@@ -50,7 +50,7 @@ func cmdEnv(c CommandLine, api libmachine.API) error {
 
 	// Ensure that log messages always go to stderr when this command is
 	// being run (it is intended to be run in a subshell)
-	log.SetOut(os.Stderr)
+	log.SetOutWriter(os.Stderr)
 
 	if c.Bool("unset") {
 		shellCfg, err = shellCfgUnset(c, api)

libmachine/drivers/plugin/localbinary/plugin_test.go

@@ -81,13 +81,13 @@ func TestExecServer(t *testing.T) {
 	logReader, logWriter := io.Pipe()
 
 	log.SetDebug(true)
-	log.SetOut(logWriter)
+	log.SetOutWriter(logWriter)
-	log.SetErr(logWriter)
+	log.SetErrWriter(logWriter)
 
 	defer func() {
 		log.SetDebug(false)
-		log.SetOut(os.Stdout)
+		log.SetOutWriter(os.Stdout)
-		log.SetErr(os.Stderr)
+		log.SetErrWriter(os.Stderr)
 	}()
 
 	stdoutReader, stdoutWriter := io.Pipe()

libmachine/log/fmt_machine_logger.go

@@ -7,8 +7,8 @@ import (
 )
 
 type FmtMachineLogger struct {
-	out     io.Writer
+	outWriter io.Writer
-	err     io.Writer
+	errWriter io.Writer
 	debug     bool
 	history   *HistoryRecorder
 }
@@ -16,8 +16,8 @@ type FmtMachineLogger struct {
 // NewFmtMachineLogger creates a MachineLogger implementation used by the drivers
 func NewFmtMachineLogger() MachineLogger {
 	return &FmtMachineLogger{
-		out:     os.Stdout,
+		outWriter: os.Stdout,
-		err:     os.Stderr,
+		errWriter: os.Stderr,
 		debug:     false,
 		history:   NewHistoryRecorder(),
 	}
@@ -27,68 +27,68 @@ func (ml *FmtMachineLogger) SetDebug(debug bool) {
 	ml.debug = debug
 }
 
-func (ml *FmtMachineLogger) SetOut(out io.Writer) {
+func (ml *FmtMachineLogger) SetOutWriter(out io.Writer) {
-	ml.out = out
+	ml.outWriter = out
 }
 
-func (ml *FmtMachineLogger) SetErr(err io.Writer) {
+func (ml *FmtMachineLogger) SetErrWriter(err io.Writer) {
-	ml.err = err
+	ml.errWriter = err
 }
 
 func (ml *FmtMachineLogger) Debug(args ...interface{}) {
 	ml.history.Record(args...)
 	if ml.debug {
-		fmt.Fprintln(ml.err, args...)
+		fmt.Fprintln(ml.errWriter, args...)
 	}
 }
 
 func (ml *FmtMachineLogger) Debugf(fmtString string, args ...interface{}) {
 	ml.history.Recordf(fmtString, args...)
 	if ml.debug {
-		fmt.Fprintf(ml.err, fmtString+"\n", args...)
+		fmt.Fprintf(ml.errWriter, fmtString+"\n", args...)
 	}
 }
 
 func (ml *FmtMachineLogger) Error(args ...interface{}) {
 	ml.history.Record(args...)
-	fmt.Fprintln(ml.err, args...)
+	fmt.Fprintln(ml.errWriter, args...)
 }
 
 func (ml *FmtMachineLogger) Errorf(fmtString string, args ...interface{}) {
 	ml.history.Recordf(fmtString, args...)
-	fmt.Fprintf(ml.err, fmtString+"\n", args...)
+	fmt.Fprintf(ml.errWriter, fmtString+"\n", args...)
 }
 
 func (ml *FmtMachineLogger) Info(args ...interface{}) {
 	ml.history.Record(args...)
-	fmt.Fprintln(ml.out, args...)
+	fmt.Fprintln(ml.outWriter, args...)
 }
 
 func (ml *FmtMachineLogger) Infof(fmtString string, args ...interface{}) {
 	ml.history.Recordf(fmtString, args...)
-	fmt.Fprintf(ml.out, fmtString+"\n", args...)
+	fmt.Fprintf(ml.outWriter, fmtString+"\n", args...)
 }
 
 func (ml *FmtMachineLogger) Fatal(args ...interface{}) {
 	ml.history.Record(args...)
-	fmt.Fprintln(ml.err, args...)
+	fmt.Fprintln(ml.errWriter, args...)
 	os.Exit(1)
 }
 
 func (ml *FmtMachineLogger) Fatalf(fmtString string, args ...interface{}) {
 	ml.history.Recordf(fmtString, args...)
-	fmt.Fprintf(ml.err, fmtString+"\n", args...)
+	fmt.Fprintf(ml.errWriter, fmtString+"\n", args...)
 	os.Exit(1)
 }
 
 func (ml *FmtMachineLogger) Warn(args ...interface{}) {
 	ml.history.Record(args...)
-	fmt.Fprintln(ml.out, args...)
+	fmt.Fprintln(ml.outWriter, args...)
 }
 
 func (ml *FmtMachineLogger) Warnf(fmtString string, args ...interface{}) {
 	ml.history.Recordf(fmtString, args...)
-	fmt.Fprintf(ml.out, fmtString+"\n", args...)
+	fmt.Fprintf(ml.outWriter, fmtString+"\n", args...)
 }
 
 func (ml *FmtMachineLogger) History() []string {

libmachine/log/fmt_machine_logger_test.go

@@ -12,7 +12,7 @@ import (
 func captureOutput(testLogger MachineLogger, lambda func()) string {
 	pipeReader, pipeWriter := io.Pipe()
 	scanner := bufio.NewScanner(pipeReader)
-	testLogger.SetOut(pipeWriter)
+	testLogger.SetOutWriter(pipeWriter)
 	go lambda()
 	scanner.Scan()
 	return scanner.Text()
@@ -21,7 +21,7 @@ func captureOutput(testLogger MachineLogger, lambda func()) string {
 func captureError(testLogger MachineLogger, lambda func()) string {
 	pipeReader, pipeWriter := io.Pipe()
 	scanner := bufio.NewScanner(pipeReader)
-	testLogger.SetErr(pipeWriter)
+	testLogger.SetErrWriter(pipeWriter)
 	go lambda()
 	scanner.Scan()
 	return scanner.Text()
@@ -42,14 +42,14 @@ func TestSetDebugToFalse(t *testing.T) {
 
 func TestSetOut(t *testing.T) {
 	testLogger := NewFmtMachineLogger().(*FmtMachineLogger)
-	testLogger.SetOut(ioutil.Discard)
+	testLogger.SetOutWriter(ioutil.Discard)
-	assert.Equal(t, ioutil.Discard, testLogger.out)
+	assert.Equal(t, ioutil.Discard, testLogger.outWriter)
 }
 
 func TestSetErr(t *testing.T) {
 	testLogger := NewFmtMachineLogger().(*FmtMachineLogger)
-	testLogger.SetErr(ioutil.Discard)
+	testLogger.SetErrWriter(ioutil.Discard)
-	assert.Equal(t, ioutil.Discard, testLogger.err)
+	assert.Equal(t, ioutil.Discard, testLogger.errWriter)
 }
 
 func TestDebug(t *testing.T) {

libmachine/log/log.go

@@ -69,12 +69,12 @@ func SetDebug(debug bool) {
 	logger.SetDebug(debug)
 }
 
-func SetOut(out io.Writer) {
+func SetOutWriter(out io.Writer) {
-	logger.SetOut(out)
+	logger.SetOutWriter(out)
 }
 
-func SetErr(err io.Writer) {
+func SetErrWriter(err io.Writer) {
-	logger.SetErr(err)
+	logger.SetErrWriter(err)
 }
 
 func History() []string {

libmachine/log/machine_logger.go

@@ -5,8 +5,8 @@ import "io"
 type MachineLogger interface {
 	SetDebug(debug bool)
 
-	SetOut(io.Writer)
+	SetOutWriter(io.Writer)
-	SetErr(io.Writer)
+	SetErrWriter(io.Writer)
 
 	Debug(args ...interface{})
 	Debugf(fmtString string, args ...interface{})