docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix filenames of loggers. 

Signed-off-by: Kent Wang <pragkent@gmail.com>
This commit is contained in:
Kent Wang 2015-10-10 16:28:45 +08:00
parent 6a5219b879
commit 6f3648735c
2 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libmachine/log/standard.go
View File

@ -2,94 +2,106 @@ package log
import ( import (
"fmt" "fmt"
"io"
"os" "os"
"sort" "sort"
) )
type TerminalLogger struct { type StandardLogger struct {
// fieldOut is used to do log.WithFields correctly // fieldOut is used to do log.WithFields correctly
fieldOut string fieldOut string
OutWriter io.Writer
ErrWriter io.Writer
} }
func (t TerminalLogger) log(args ...interface{}) { func (t StandardLogger) log(args ...interface{}) {
fmt.Print(args...) fmt.Fprint(t.OutWriter, args...)
fmt.Print(t.fieldOut, "\n") fmt.Fprint(t.OutWriter, t.fieldOut, "\n")
t.fieldOut = "" t.fieldOut = ""
} }
func (t TerminalLogger) logf(fmtString string, args ...interface{}) { func (t StandardLogger) logf(fmtString string, args ...interface{}) {
fmt.Printf(fmtString, args...) fmt.Fprintf(t.OutWriter, fmtString, args...)
fmt.Print(t.fieldOut, "\n") fmt.Fprint(t.OutWriter, "\n")
t.fieldOut = "" t.fieldOut = ""
} }
func (t TerminalLogger) err(args ...interface{}) { func (t StandardLogger) err(args ...interface{}) {
fmt.Fprint(os.Stderr, args...) fmt.Fprint(t.ErrWriter, args...)
fmt.Fprint(os.Stderr, t.fieldOut, "\n") fmt.Fprint(t.ErrWriter, t.fieldOut, "\n")
t.fieldOut = "" t.fieldOut = ""
} }
func (t TerminalLogger) errf(fmtString string, args ...interface{}) { func (t StandardLogger) errf(fmtString string, args ...interface{}) {
fmt.Fprintf(os.Stderr, fmtString, args...) fmt.Fprintf(t.ErrWriter, fmtString, args...)
fmt.Fprint(os.Stderr, t.fieldOut, "\n") fmt.Fprint(t.ErrWriter, t.fieldOut, "\n")
t.fieldOut = "" t.fieldOut = ""
} }
func (t TerminalLogger) Debug(args ...interface{}) { func (t StandardLogger) Debug(args ...interface{}) {
if IsDebug { 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 { 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...) t.err(args...)
} }
func (t TerminalLogger) Errorf(fmtString string, args ...interface{}) { func (t StandardLogger) Errorf(fmtString string, args ...interface{}) {
t.errf(fmtString, args...) 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...) t.log(args...)
} }
func (t TerminalLogger) Infof(fmtString string, args ...interface{}) { func (t StandardLogger) Infof(fmtString string, args ...interface{}) {
t.logf(fmtString, args...) 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...) t.err(args...)
os.Exit(1) os.Exit(1)
} }
func (t TerminalLogger) Fatalf(fmtString string, args ...interface{}) { func (t StandardLogger) Fatalf(fmtString string, args ...interface{}) {
t.errf(fmtString, args...) t.errf(fmtString, args...)
os.Exit(1) os.Exit(1)
} }
func (t TerminalLogger) Print(args ...interface{}) { func (t StandardLogger) Print(args ...interface{}) {
t.log(args...) t.log(args...)
} }
func (t TerminalLogger) Printf(fmtString string, args ...interface{}) { func (t StandardLogger) Printf(fmtString string, args ...interface{}) {
t.logf(fmtString, args...) t.logf(fmtString, args...)
} }
func (t TerminalLogger) Warn(args ...interface{}) { func (t StandardLogger) Warn(args ...interface{}) {
t.log(args...) t.log(args...)
} }
func (t TerminalLogger) Warnf(fmtString string, args ...interface{}) { func (t StandardLogger) Warnf(fmtString string, args ...interface{}) {
t.logf(fmtString, args...) 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 // When the user calls WithFields, we make a string which gets appended
// to the output of the final [Info|Warn|Error] call for the // to the output of the final [Info|Warn|Error] call for the
// descriptive fields. Because WithFields returns the proper Logger // descriptive fields. Because WithFields returns the proper Logger

68
libmachine/log/terminal.go
View File

@ -2,106 +2,94 @@ package log
import ( import (
"fmt" "fmt"
"io"
"os" "os"
"sort" "sort"
) )
type StandardLogger struct { type TerminalLogger struct {
// fieldOut is used to do log.WithFields correctly // fieldOut is used to do log.WithFields correctly
fieldOut string fieldOut string
OutWriter io.Writer
ErrWriter io.Writer
} }
func (t StandardLogger) log(args ...interface{}) { func (t TerminalLogger) log(args ...interface{}) {
fmt.Fprint(t.OutWriter, args...) fmt.Print(args...)
fmt.Fprint(t.OutWriter, t.fieldOut, "\n") fmt.Print(t.fieldOut, "\n")
t.fieldOut = "" t.fieldOut = ""
} }
func (t StandardLogger) logf(fmtString string, args ...interface{}) { func (t TerminalLogger) logf(fmtString string, args ...interface{}) {
fmt.Fprintf(t.OutWriter, fmtString, args...) fmt.Printf(fmtString, args...)
fmt.Fprint(t.OutWriter, "\n") fmt.Print(t.fieldOut, "\n")
t.fieldOut = "" t.fieldOut = ""
} }
func (t StandardLogger) err(args ...interface{}) { func (t TerminalLogger) err(args ...interface{}) {
fmt.Fprint(t.ErrWriter, args...) fmt.Fprint(os.Stderr, args...)
fmt.Fprint(t.ErrWriter, t.fieldOut, "\n") fmt.Fprint(os.Stderr, t.fieldOut, "\n")
t.fieldOut = "" t.fieldOut = ""
} }
func (t StandardLogger) errf(fmtString string, args ...interface{}) { func (t TerminalLogger) errf(fmtString string, args ...interface{}) {
fmt.Fprintf(t.ErrWriter, fmtString, args...) fmt.Fprintf(os.Stderr, fmtString, args...)
fmt.Fprint(t.ErrWriter, t.fieldOut, "\n") fmt.Fprint(os.Stderr, t.fieldOut, "\n")
t.fieldOut = "" t.fieldOut = ""
} }
func (t StandardLogger) Debug(args ...interface{}) { func (t TerminalLogger) Debug(args ...interface{}) {
if IsDebug { 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 { 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...) t.err(args...)
} }
func (t StandardLogger) Errorf(fmtString string, args ...interface{}) { func (t TerminalLogger) Errorf(fmtString string, args ...interface{}) {
t.errf(fmtString, args...) t.errf(fmtString, args...)
} }
func (t StandardLogger) Errorln(args ...interface{}) { func (t TerminalLogger) Info(args ...interface{}) {
t.err(args...)
}
func (t StandardLogger) Info(args ...interface{}) {
t.log(args...) t.log(args...)
} }
func (t StandardLogger) Infof(fmtString string, args ...interface{}) { func (t TerminalLogger) Infof(fmtString string, args ...interface{}) {
t.logf(fmtString, args...) t.logf(fmtString, args...)
} }
func (t StandardLogger) Infoln(args ...interface{}) { func (t TerminalLogger) Fatal(args ...interface{}) {
t.log(args...)
}
func (t StandardLogger) Fatal(args ...interface{}) {
t.err(args...) t.err(args...)
os.Exit(1) os.Exit(1)
} }
func (t StandardLogger) Fatalf(fmtString string, args ...interface{}) { func (t TerminalLogger) Fatalf(fmtString string, args ...interface{}) {
t.errf(fmtString, args...) t.errf(fmtString, args...)
os.Exit(1) os.Exit(1)
} }
func (t StandardLogger) Print(args ...interface{}) { func (t TerminalLogger) Print(args ...interface{}) {
t.log(args...) t.log(args...)
} }
func (t StandardLogger) Printf(fmtString string, args ...interface{}) { func (t TerminalLogger) Printf(fmtString string, args ...interface{}) {
t.logf(fmtString, args...) t.logf(fmtString, args...)
} }
func (t StandardLogger) Warn(args ...interface{}) { func (t TerminalLogger) Warn(args ...interface{}) {
t.log(args...) t.log(args...)
} }
func (t StandardLogger) Warnf(fmtString string, args ...interface{}) { func (t TerminalLogger) Warnf(fmtString string, args ...interface{}) {
t.logf(fmtString, args...) 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 // When the user calls WithFields, we make a string which gets appended
// to the output of the final [Info|Warn|Error] call for the // to the output of the final [Info|Warn|Error] call for the
// descriptive fields. Because WithFields returns the proper Logger // descriptive fields. Because WithFields returns the proper Logger