X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm-remote%2Flog%2Flogger.go;h=8bf0a43ee0506b94a5edb02fe42dbd473910ce21;hb=b2d5dd94dfb0cf2154f7c2da4b2e0bd292fed77e;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..8bf0a43 100644
--- a/cmd/safcm-remote/log/logger.go
+++ b/cmd/safcm-remote/log/logger.go
@@ -24,37 +24,31 @@ 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 PrefixLogger struct {
+type Logger struct {
 	fun    LogFunc
 	prefix string
 }
 
-func NewLogger(prefix string, fun LogFunc) *PrefixLogger {
-	return &PrefixLogger{
+func NewLogger(prefix string, fun LogFunc) *Logger {
+	return &Logger{
 		fun:    fun,
 		prefix: prefix,
 	}
 }
 
-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, l.prefix+" "+fmt.Sprintf(format, a...))
 }