safcm: simplify Sync.logf to take the log message as string

[safcm/safcm.git] / cmd / safcm / sync.go

diff --git a/cmd/safcm/sync.go b/cmd/safcm/sync.go
index 54df9ec6230efc8cffda0ff347960efb0317a61a..4a82ca3b906464f8ce58f652f4abf9afbbf71cb8 100644 (file)
--- a/cmd/safcm/sync.go
+++ b/cmd/safcm/sync.go
@@ -247,13 +247,13 @@ are only available after the hosts were contacted.
        nameMatched := make(map[string]bool)
        // To detect typos we must check all given names but one host can be
        // matched by multiple names (e.g. two groups with overlapping hosts)
-       hostMatched := make(map[string]bool)
+       hostAdded := make(map[string]bool)
 
        var res []*config.Host
        for _, host := range allHosts.List {
                if nameMap[host.Name] {
                        res = append(res, host)
-                       hostMatched[host.Name] = true
+                       hostAdded[host.Name] = true
                        nameMatched[host.Name] = true
                }
 
@@ -264,9 +264,9 @@ are only available after the hosts were contacted.
                }
                for _, x := range groups {
                        if nameMap[x] {
-                               if !hostMatched[host.Name] {
+                               if !hostAdded[host.Name] {
                                        res = append(res, host)
-                                       hostMatched[host.Name] = true
+                                       hostAdded[host.Name] = true
                                }
                                nameMatched[x] = true
                        }
@@ -400,9 +400,7 @@ func (s *Sync) Host(wg *sync.WaitGroup) error {
        return nil
 }
 
-func (s *Sync) logf(level safcm.LogLevel, escaped bool,
-       format string, a ...interface{}) {
-
+func (s *Sync) log(level safcm.LogLevel, escaped bool, msg string) {
        if s.config.LogLevel < level {
                return
        }
@@ -410,16 +408,16 @@ func (s *Sync) logf(level safcm.LogLevel, escaped bool,
                Host: s.host,
                Log: Log{
                        Level: level,
-                       Text:  fmt.Sprintf(format, a...),
+                       Text:  msg,
                },
                Escaped: escaped,
        }
 }
 func (s *Sync) logDebugf(format string, a ...interface{}) {
-       s.logf(safcm.LogDebug, false, format, a...)
+       s.log(safcm.LogDebug, false, fmt.Sprintf(format, a...))
 }
 func (s *Sync) logVerbosef(format string, a ...interface{}) {
-       s.logf(safcm.LogVerbose, false, format, a...)
+       s.log(safcm.LogVerbose, false, fmt.Sprintf(format, a...))
 }
 
 // sendRecv sends a message over conn and waits for the response. Any MsgLog
@@ -437,7 +435,7 @@ func (s *Sync) sendRecv(conn *rpc.Conn, msg safcm.Msg) (safcm.Msg, error) {
                }
                log, ok := x.(safcm.MsgLog)
                if ok {
-                       s.logf(log.Level, false, "%s", log.Text)
+                       s.log(log.Level, false, log.Text)
                        continue
                }
                return x, nil