X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fsync_info.go;h=8672a3e4d7fbba2ff1cba37b22e40925f586dd40;hb=cd7436284aa538d6a8a83811a33b3a3cc32d87a3;hp=b0a85ee507f4603b2966eb0b7b6e8b6f74dba12a;hpb=f2f2bc47e8729548f3c10117f7f008b547c4afc5;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/sync_info.go b/cmd/safcm/sync_info.go
index b0a85ee..8672a3e 100644
--- a/cmd/safcm/sync_info.go
+++ b/cmd/safcm/sync_info.go
@@ -28,36 +28,37 @@ import (
 )
 
 func (s *Sync) hostInfo(conn *rpc.Conn) ([]string, error) {
-	x, err := s.sendRecv(conn, safcm.MsgInfoReq{
+	resp, err := s.loop.HostInfoMsg(s, conn, safcm.MsgInfoReq{
 		LogLevel:     s.config.LogLevel,
 		DetectGroups: s.config.DetectGroups,
 	})
 	if err != nil {
 		return nil, err
 	}
-	resp, ok := x.(safcm.MsgInfoResp)
-	if !ok {
-		return nil, fmt.Errorf("unexpected response %v", x)
-	}
 	if resp.Error != "" {
 		return nil, fmt.Errorf("%s", resp.Error)
 	}
 	return hostInfoRespToGroups(resp), nil
 }
 
-// Keep in sync with config/groups.go:groupNameRegexp
+// Keep in sync with cmd/safcm/config/groups.go:groupNameRegexp
 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
+}