X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Flog%2Flogger.go;h=f358b75af7bad9cf35f47c4a1abd1a28c2311483;hb=e0d1ceb383e5672de1a414f192eb2849a1887934;hp=159e0976089a607a89ce15f0df228fbc97972edf;hpb=f2f2bc47e8729548f3c10117f7f008b547c4afc5;p=safcm%2Fsafcm.git diff --git a/cmd/safcm-remote/log/logger.go b/cmd/safcm-remote/log/logger.go index 159e097..f358b75 100644 --- a/cmd/safcm-remote/log/logger.go +++ b/cmd/safcm-remote/log/logger.go @@ -24,37 +24,29 @@ import ( ) // LogFunc is a helper type to reduce typing. -type LogFunc func(level safcm.LogLevel, format string, a ...interface{}) +type LogFunc func(level safcm.LogLevel, msg string) -type Logger interface { - Verbosef(format string, a ...interface{}) - Debugf(format string, a ...interface{}) - Debug2f(format string, a ...interface{}) +type Logger struct { + fun LogFunc } -type PrefixLogger struct { - fun LogFunc - prefix string -} - -func NewLogger(prefix string, fun LogFunc) *PrefixLogger { - return &PrefixLogger{ - fun: fun, - prefix: prefix, +func NewLogger(fun LogFunc) *Logger { + return &Logger{ + fun: fun, } } -func (l *PrefixLogger) Verbosef(format string, a ...interface{}) { +func (l *Logger) Verbosef(format string, a ...interface{}) { l.log(safcm.LogVerbose, format, a...) } -func (l *PrefixLogger) Debugf(format string, a ...interface{}) { +func (l *Logger) Debugf(format string, a ...interface{}) { l.log(safcm.LogDebug, format, a...) } -func (l *PrefixLogger) Debug2f(format string, a ...interface{}) { +func (l *Logger) Debug2f(format string, a ...interface{}) { l.log(safcm.LogDebug2, format, a...) } -func (l *PrefixLogger) log(level safcm.LogLevel, +func (l *Logger) log(level safcm.LogLevel, format string, a ...interface{}) { - l.fun(level, "%s %s", l.prefix, fmt.Sprintf(format, a...)) + l.fun(level, fmt.Sprintf(format, a...)) }