sync: replace log.Logger interface with struct

PrefixLogger is the only implementation of Logger. Simply remove the
interface and rename PrefixLogger to Logger.

diff --git a/cmd/safcm-remote/info/info.go b/cmd/safcm-remote/info/info.go
index c3853dde6a7dcde5578a7e04d3cc6c14b5baa841..4de44f3b0f42faaf7b6dfa7c5daaa2ecb4bf9ee2 100644 (file)
--- a/cmd/safcm-remote/info/info.go
+++ b/cmd/safcm-remote/info/info.go
@@ -31,7 +31,7 @@ type Info struct {
        resp safcm.MsgInfoResp
 
        cmd    *run.Cmd
-       logger *log.PrefixLogger
+       logger *log.Logger
 }
 
 const logPrefix = "info remote:"

diff --git a/cmd/safcm-remote/log/logger.go b/cmd/safcm-remote/log/logger.go
index 159e0976089a607a89ce15f0df228fbc97972edf..8d88d8948b4e332ae72638058fa67b87ee2d4a3a 100644 (file)
--- a/cmd/safcm-remote/log/logger.go
+++ b/cmd/safcm-remote/log/logger.go
@@ -26,35 +26,29 @@ import (
 // LogFunc is a helper type to reduce typing.
 type LogFunc func(level safcm.LogLevel, format string, a ...interface{})
 
-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...))
 }

diff --git a/cmd/safcm-remote/run/cmd.go b/cmd/safcm-remote/run/cmd.go
index 4700ea3367806e434aae60878712002f88cf453e..36e4e75bf332fdf011cf7f9df694f725cd14f541 100644 (file)
--- a/cmd/safcm-remote/run/cmd.go
+++ b/cmd/safcm-remote/run/cmd.go
@@ -28,10 +28,10 @@ import (
 
 type Cmd struct {
        Runner Runner
-       logger log.Logger
+       logger *log.Logger
 }
 
-func NewCmd(runner Runner, logger log.Logger) *Cmd {
+func NewCmd(runner Runner, logger *log.Logger) *Cmd {
        return &Cmd{
                Runner: runner,
                logger: logger,

diff --git a/cmd/safcm-remote/sync/sync.go b/cmd/safcm-remote/sync/sync.go
index 6f1cb78430b360184449ae03412c0f6d67583166..706791f3969e0dbc98e02d9b0d5f6a9b873ebbb3 100644 (file)
--- a/cmd/safcm-remote/sync/sync.go
+++ b/cmd/safcm-remote/sync/sync.go
@@ -37,7 +37,7 @@ type Sync struct {
        triggersActive map[string]bool
 
        cmd *run.Cmd
-       log *log.PrefixLogger
+       log *log.Logger
 }
 
 const logPrefix = "sync remote:"