From 6f3648735ccf7b01810aeb4ca6617f07c0df7059 Mon Sep 17 00:00:00 2001 From: Kent Wang Date: Sat, 10 Oct 2015 16:28:45 +0800 Subject: [PATCH] Fix filenames of loggers. Signed-off-by: Kent Wang --- libmachine/log/standard.go | 70 ++++++++++++++++++++++---------------- libmachine/log/terminal.go | 70 ++++++++++++++++---------------------- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/libmachine/log/standard.go b/libmachine/log/standard.go index 8fc8c80163..f579e0e159 100644 --- a/libmachine/log/standard.go +++ b/libmachine/log/standard.go @@ -2,94 +2,106 @@ package log import ( "fmt" + "io" "os" "sort" ) -type TerminalLogger struct { +type StandardLogger struct { // fieldOut is used to do log.WithFields correctly - fieldOut string + fieldOut string + OutWriter io.Writer + ErrWriter io.Writer } -func (t TerminalLogger) log(args ...interface{}) { - fmt.Print(args...) - fmt.Print(t.fieldOut, "\n") +func (t StandardLogger) log(args ...interface{}) { + fmt.Fprint(t.OutWriter, args...) + fmt.Fprint(t.OutWriter, t.fieldOut, "\n") t.fieldOut = "" } -func (t TerminalLogger) logf(fmtString string, args ...interface{}) { - fmt.Printf(fmtString, args...) - fmt.Print(t.fieldOut, "\n") +func (t StandardLogger) logf(fmtString string, args ...interface{}) { + fmt.Fprintf(t.OutWriter, fmtString, args...) + fmt.Fprint(t.OutWriter, "\n") t.fieldOut = "" } -func (t TerminalLogger) err(args ...interface{}) { - fmt.Fprint(os.Stderr, args...) - fmt.Fprint(os.Stderr, t.fieldOut, "\n") +func (t StandardLogger) err(args ...interface{}) { + fmt.Fprint(t.ErrWriter, args...) + fmt.Fprint(t.ErrWriter, t.fieldOut, "\n") t.fieldOut = "" } -func (t TerminalLogger) errf(fmtString string, args ...interface{}) { - fmt.Fprintf(os.Stderr, fmtString, args...) - fmt.Fprint(os.Stderr, t.fieldOut, "\n") +func (t StandardLogger) errf(fmtString string, args ...interface{}) { + fmt.Fprintf(t.ErrWriter, fmtString, args...) + fmt.Fprint(t.ErrWriter, t.fieldOut, "\n") t.fieldOut = "" } -func (t TerminalLogger) Debug(args ...interface{}) { +func (t StandardLogger) Debug(args ...interface{}) { if IsDebug { - t.log(args...) + t.err(args...) } } -func (t TerminalLogger) Debugf(fmtString string, args ...interface{}) { +func (t StandardLogger) Debugf(fmtString string, args ...interface{}) { if IsDebug { - t.logf(fmtString, args...) + t.errf(fmtString, args...) } } -func (t TerminalLogger) Error(args ...interface{}) { +func (t StandardLogger) Error(args ...interface{}) { t.err(args...) } -func (t TerminalLogger) Errorf(fmtString string, args ...interface{}) { +func (t StandardLogger) Errorf(fmtString string, args ...interface{}) { t.errf(fmtString, args...) } -func (t TerminalLogger) Info(args ...interface{}) { +func (t StandardLogger) Errorln(args ...interface{}) { + + t.err(args...) +} + +func (t StandardLogger) Info(args ...interface{}) { t.log(args...) } -func (t TerminalLogger) Infof(fmtString string, args ...interface{}) { +func (t StandardLogger) Infof(fmtString string, args ...interface{}) { t.logf(fmtString, args...) } -func (t TerminalLogger) Fatal(args ...interface{}) { +func (t StandardLogger) Infoln(args ...interface{}) { + t.log(args...) +} + +func (t StandardLogger) Fatal(args ...interface{}) { t.err(args...) os.Exit(1) } -func (t TerminalLogger) Fatalf(fmtString string, args ...interface{}) { +func (t StandardLogger) Fatalf(fmtString string, args ...interface{}) { t.errf(fmtString, args...) os.Exit(1) } -func (t TerminalLogger) Print(args ...interface{}) { +func (t StandardLogger) Print(args ...interface{}) { t.log(args...) } -func (t TerminalLogger) Printf(fmtString string, args ...interface{}) { +func (t StandardLogger) Printf(fmtString string, args ...interface{}) { t.logf(fmtString, args...) } -func (t TerminalLogger) Warn(args ...interface{}) { +func (t StandardLogger) Warn(args ...interface{}) { t.log(args...) } -func (t TerminalLogger) Warnf(fmtString string, args ...interface{}) { +func (t StandardLogger) Warnf(fmtString string, args ...interface{}) { t.logf(fmtString, args...) } -func (t TerminalLogger) WithFields(fields Fields) Logger { +func (t StandardLogger) WithFields(fields Fields) Logger { // When the user calls WithFields, we make a string which gets appended // to the output of the final [Info|Warn|Error] call for the // descriptive fields. Because WithFields returns the proper Logger diff --git a/libmachine/log/terminal.go b/libmachine/log/terminal.go index f579e0e159..8fc8c80163 100644 --- a/libmachine/log/terminal.go +++ b/libmachine/log/terminal.go @@ -2,106 +2,94 @@ package log import ( "fmt" - "io" "os" "sort" ) -type StandardLogger struct { +type TerminalLogger struct { // fieldOut is used to do log.WithFields correctly - fieldOut string - OutWriter io.Writer - ErrWriter io.Writer + fieldOut string } -func (t StandardLogger) log(args ...interface{}) { - fmt.Fprint(t.OutWriter, args...) - fmt.Fprint(t.OutWriter, t.fieldOut, "\n") +func (t TerminalLogger) log(args ...interface{}) { + fmt.Print(args...) + fmt.Print(t.fieldOut, "\n") t.fieldOut = "" } -func (t StandardLogger) logf(fmtString string, args ...interface{}) { - fmt.Fprintf(t.OutWriter, fmtString, args...) - fmt.Fprint(t.OutWriter, "\n") +func (t TerminalLogger) logf(fmtString string, args ...interface{}) { + fmt.Printf(fmtString, args...) + fmt.Print(t.fieldOut, "\n") t.fieldOut = "" } -func (t StandardLogger) err(args ...interface{}) { - fmt.Fprint(t.ErrWriter, args...) - fmt.Fprint(t.ErrWriter, t.fieldOut, "\n") +func (t TerminalLogger) err(args ...interface{}) { + fmt.Fprint(os.Stderr, args...) + fmt.Fprint(os.Stderr, t.fieldOut, "\n") t.fieldOut = "" } -func (t StandardLogger) errf(fmtString string, args ...interface{}) { - fmt.Fprintf(t.ErrWriter, fmtString, args...) - fmt.Fprint(t.ErrWriter, t.fieldOut, "\n") +func (t TerminalLogger) errf(fmtString string, args ...interface{}) { + fmt.Fprintf(os.Stderr, fmtString, args...) + fmt.Fprint(os.Stderr, t.fieldOut, "\n") t.fieldOut = "" } -func (t StandardLogger) Debug(args ...interface{}) { +func (t TerminalLogger) Debug(args ...interface{}) { if IsDebug { - t.err(args...) + t.log(args...) } } -func (t StandardLogger) Debugf(fmtString string, args ...interface{}) { +func (t TerminalLogger) Debugf(fmtString string, args ...interface{}) { if IsDebug { - t.errf(fmtString, args...) + t.logf(fmtString, args...) } } -func (t StandardLogger) Error(args ...interface{}) { +func (t TerminalLogger) Error(args ...interface{}) { t.err(args...) } -func (t StandardLogger) Errorf(fmtString string, args ...interface{}) { +func (t TerminalLogger) Errorf(fmtString string, args ...interface{}) { t.errf(fmtString, args...) } -func (t StandardLogger) Errorln(args ...interface{}) { - - t.err(args...) -} - -func (t StandardLogger) Info(args ...interface{}) { +func (t TerminalLogger) Info(args ...interface{}) { t.log(args...) } -func (t StandardLogger) Infof(fmtString string, args ...interface{}) { +func (t TerminalLogger) Infof(fmtString string, args ...interface{}) { t.logf(fmtString, args...) } -func (t StandardLogger) Infoln(args ...interface{}) { - t.log(args...) -} - -func (t StandardLogger) Fatal(args ...interface{}) { +func (t TerminalLogger) Fatal(args ...interface{}) { t.err(args...) os.Exit(1) } -func (t StandardLogger) Fatalf(fmtString string, args ...interface{}) { +func (t TerminalLogger) Fatalf(fmtString string, args ...interface{}) { t.errf(fmtString, args...) os.Exit(1) } -func (t StandardLogger) Print(args ...interface{}) { +func (t TerminalLogger) Print(args ...interface{}) { t.log(args...) } -func (t StandardLogger) Printf(fmtString string, args ...interface{}) { +func (t TerminalLogger) Printf(fmtString string, args ...interface{}) { t.logf(fmtString, args...) } -func (t StandardLogger) Warn(args ...interface{}) { +func (t TerminalLogger) Warn(args ...interface{}) { t.log(args...) } -func (t StandardLogger) Warnf(fmtString string, args ...interface{}) { +func (t TerminalLogger) Warnf(fmtString string, args ...interface{}) { t.logf(fmtString, args...) } -func (t StandardLogger) WithFields(fields Fields) Logger { +func (t TerminalLogger) WithFields(fields Fields) Logger { // When the user calls WithFields, we make a string which gets appended // to the output of the final [Info|Warn|Error] call for the // descriptive fields. Because WithFields returns the proper Logger