X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cmd%2Fsafcm%2Fsync_info.go;h=91878e8ea1e109165e42006f78e18089e60d77fe;hb=5bbdbf913be3152f60d556e4b20e1ddb2d66d0c0;hp=b0a85ee507f4603b2966eb0b7b6e8b6f74dba12a;hpb=f2f2bc47e8729548f3c10117f7f008b547c4afc5;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/sync_info.go b/cmd/safcm/sync_info.go
index b0a85ee..91878e8 100644
--- 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,
 	})
@@ -45,19 +45,24 @@ func (s *Sync) hostInfo(conn *rpc.Conn) ([]string, 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
+}