- First RPC steps - Work on some flaws in RPC model - Remove unused TLS settings from Engine and Swarm options - Add code to correctly encode data over the network - Add client driver for RPC - Rename server driver file - Start to make marshal make sense - Fix silly RPC method args and add client - Fix some issues with RPC calls, and marshaling - Simplify plugin main.go - Move towards 100% plugin in CLI - Ensure that plugin servers are cleaned up properly - Make flag parsing for driver flags work properly Includes some work carried from @dmp42 updating the build process and tests to use the new method. Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
125 lines
2.3 KiB
Go
125 lines
2.3 KiB
Go
package log
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
"sync"
|
|
)
|
|
|
|
// Why the interface? We may only want to print to STDOUT and STDERR for now,
|
|
// but it won't neccessarily be that way forever. This interface is intended
|
|
// to provide a "framework" for a variety of different logging types in the
|
|
// future (log to file, log to logstash, etc.) There could be a driver model
|
|
// similar to what is done with OS or machine providers.
|
|
type Logger interface {
|
|
Debug(...interface{})
|
|
Debugf(string, ...interface{})
|
|
|
|
Error(...interface{})
|
|
Errorf(string, ...interface{})
|
|
|
|
Info(...interface{})
|
|
Infof(string, ...interface{})
|
|
|
|
Fatal(...interface{})
|
|
Fatalf(string, ...interface{})
|
|
|
|
Print(...interface{})
|
|
Printf(string, ...interface{})
|
|
|
|
Warn(...interface{})
|
|
Warnf(string, ...interface{})
|
|
|
|
WithFields(Fields) Logger
|
|
}
|
|
|
|
var (
|
|
l = StandardLogger{
|
|
mu: &sync.Mutex{},
|
|
}
|
|
IsDebug bool = false
|
|
)
|
|
|
|
type Fields map[string]interface{}
|
|
|
|
func init() {
|
|
// TODO: Is this really the best approach? I worry that it will create
|
|
// implicit behavior which may be problmatic for users of the lib.
|
|
SetOutWriter(os.Stdout)
|
|
SetErrWriter(os.Stderr)
|
|
}
|
|
|
|
func SetOutWriter(w io.Writer) {
|
|
l.OutWriter = w
|
|
}
|
|
|
|
func SetErrWriter(w io.Writer) {
|
|
l.ErrWriter = w
|
|
}
|
|
|
|
func Debug(args ...interface{}) {
|
|
l.Debug(args...)
|
|
}
|
|
|
|
func Debugf(fmtString string, args ...interface{}) {
|
|
l.Debugf(fmtString, args...)
|
|
}
|
|
|
|
func Error(args ...interface{}) {
|
|
l.Error(args...)
|
|
}
|
|
|
|
func Errorf(fmtString string, args ...interface{}) {
|
|
l.Errorf(fmtString, args...)
|
|
}
|
|
|
|
func Errorln(args ...interface{}) {
|
|
l.Errorln(args...)
|
|
}
|
|
|
|
func Info(args ...interface{}) {
|
|
l.Info(args...)
|
|
}
|
|
|
|
func Infof(fmtString string, args ...interface{}) {
|
|
l.Infof(fmtString, args...)
|
|
}
|
|
|
|
func Infoln(args ...interface{}) {
|
|
l.Infoln(args...)
|
|
}
|
|
|
|
func Fatal(args ...interface{}) {
|
|
l.Fatal(args...)
|
|
}
|
|
|
|
func Fatalf(fmtString string, args ...interface{}) {
|
|
l.Fatalf(fmtString, args...)
|
|
}
|
|
|
|
func Print(args ...interface{}) {
|
|
l.Print(args...)
|
|
}
|
|
|
|
func Printf(fmtString string, args ...interface{}) {
|
|
l.Printf(fmtString, args...)
|
|
}
|
|
|
|
func Warn(args ...interface{}) {
|
|
l.Warn(args...)
|
|
}
|
|
|
|
func Warnf(fmtString string, args ...interface{}) {
|
|
l.Warnf(fmtString, args...)
|
|
}
|
|
|
|
func WithField(fieldName string, field interface{}) Logger {
|
|
return l.WithFields(Fields{
|
|
fieldName: field,
|
|
})
|
|
}
|
|
|
|
func WithFields(fields Fields) Logger {
|
|
return l.WithFields(fields)
|
|
}
|