safcm: move sync.sendRecv to frontend package

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

diff --git a/cmd/safcm/sync_info.go b/cmd/safcm/sync_info.go
index 0df33e3eeaa302ef52c8a7d149e5f107d82812b1..91878e8ea1e109165e42006f78e18089e60d77fe 100644 (file)
--- a/cmd/safcm/sync_info.go
+++ b/cmd/safcm/sync_info.go
@@ -28,7 +28,7 @@ import (
 )
 
 func (s *Sync) hostInfo(conn *rpc.Conn) ([]string, error) {
-       x, err := s.sendRecv(conn, safcm.MsgInfoReq{
+       x, err := s.loop.SendRecv(s, conn, safcm.MsgInfoReq{
                LogLevel:     s.config.LogLevel,
                DetectGroups: s.config.DetectGroups,
        })
@@ -50,14 +50,19 @@ var infoGroupDetectedRegexp = regexp.MustCompile(`[^a-z0-9_-]+`)
 
 func hostInfoRespToGroups(resp safcm.MsgInfoResp) []string {
        groups := []string{
-               config.GroupDetectedPrefix + "_" + resp.Goos,
-               config.GroupDetectedPrefix + "_" + resp.Goarch,
+               hostInfoDetectedGroupName(resp.Goos),
+               hostInfoDetectedGroupName(resp.Goarch),
        }
        for _, x := range resp.Output {
-               x = strings.TrimSpace(x)
-               x = strings.ToLower(x)
-               x = infoGroupDetectedRegexp.ReplaceAllString(x, "_")
-               groups = append(groups, config.GroupDetectedPrefix+"_"+x)
+               groups = append(groups, hostInfoDetectedGroupName(x))
        }
        return groups
 }
+
+func hostInfoDetectedGroupName(x string) string {
+       x = strings.TrimSpace(x)
+       x = strings.ToLower(x)
+       x = infoGroupDetectedRegexp.ReplaceAllString(x, "_")
+       x = config.GroupDetectedPrefix + "_" + x
+       return x
+}