X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fsync.go;h=69431435e5e9f3066ebf82aa4ebb8add1afbacb0;hb=HEAD;hp=c1ecc965eec221828788f2bf68acd1481f08d78e;hpb=c899e17495d4eb932e0b4f428ec91882d845f1bc;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/sync.go b/cmd/safcm/sync.go
index c1ecc96..6943143 100644
--- a/cmd/safcm/sync.go
+++ b/cmd/safcm/sync.go
@@ -1,19 +1,7 @@
 // "sync" sub-command: sync data to remote hosts
 
-// Copyright (C) 2021  Simon Ruderich
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright (C) 2021-2024  Simon Ruderich
 
 package main
 
@@ -44,6 +32,7 @@ type Sync struct {
 
 	isTTY bool
 
+	loop    *frontend.Loop
 	logFunc func(level safcm.LogLevel, escaped bool, msg string)
 }
 
@@ -64,24 +53,11 @@ func MainSync(args []string) error {
 	optionSshConfig := flag.String("sshconfig", "",
 		"`path` to ssh configuration file; used for tests")
 
-	flag.CommandLine.Parse(args[2:])
-
-	var level safcm.LogLevel
-	switch *optionLog {
-	case "error":
-		level = safcm.LogError
-	case "info":
-		level = safcm.LogInfo
-	case "verbose":
-		level = safcm.LogVerbose
-	case "debug":
-		level = safcm.LogDebug
-	case "debug2":
-		level = safcm.LogDebug2
-	case "debug3":
-		level = safcm.LogDebug3
-	default:
-		return fmt.Errorf("invalid -log value %q", *optionLog)
+	flag.CommandLine.Parse(args[2:]) //nolint:errcheck
+
+	level, err := safcm.ParseLogLevel(*optionLog)
+	if err != nil {
+		return fmt.Errorf("-log: %v", err)
 	}
 
 	names := flag.Args()
@@ -117,7 +93,7 @@ func MainSync(args []string) error {
 	loop := &frontend.Loop{
 		DebugConn: cfg.LogLevel >= safcm.LogDebug3,
 		LogEventFunc: func(x frontend.Event, failed *bool) {
-			logEvent(x, cfg.LogLevel, isTTY, failed)
+			frontend.LogEvent(x, cfg.LogLevel, isTTY, failed)
 		},
 		SyncHostFunc: func(conn *rpc.Conn, host frontend.Host) error {
 			return host.(*Sync).Host(conn)
@@ -127,15 +103,16 @@ func MainSync(args []string) error {
 	var hosts []frontend.Host
 	for _, x := range toSync {
 		s := &Sync{
-				host:      x,
-				config:    cfg,
-				allHosts:  allHosts,
-				allGroups: allGroups,
-				isTTY:     isTTY,
-			}
+			host:      x,
+			config:    cfg,
+			allHosts:  allHosts,
+			allGroups: allGroups,
+			isTTY:     isTTY,
+			loop:      loop,
+		}
 		s.logFunc = func(level safcm.LogLevel, escaped bool,
 			msg string) {
-			loop.Log(s, level, escaped, msg)
+			s.loop.Log(s, level, escaped, msg)
 		}
 		hosts = append(hosts, s)
 	}
@@ -224,66 +201,6 @@ are only available after the hosts were contacted.
 	return res, nil
 }
 
-func logEvent(x frontend.Event, level safcm.LogLevel, isTTY bool, failed *bool) {
-	// We have multiple event sources so this is somewhat ugly.
-	var prefix, data string
-	var color Color
-	if x.Error != nil {
-		prefix = "[error]"
-		data = x.Error.Error()
-		color = ColorRed
-		// We logged an error, tell the caller
-		*failed = true
-	} else if x.Log.Level != 0 {
-		if level < x.Log.Level {
-			return
-		}
-		// LogError and LogDebug3 should not occur here
-		switch x.Log.Level {
-		case safcm.LogInfo:
-			prefix = "[info]"
-		case safcm.LogVerbose:
-			prefix = "[verbose]"
-		case safcm.LogDebug:
-			prefix = "[debug]"
-		case safcm.LogDebug2:
-			prefix = "[debug2]"
-		default:
-			prefix = fmt.Sprintf("[INVALID=%d]", x.Log.Level)
-			color = ColorRed
-		}
-		data = x.Log.Text
-	} else {
-		switch x.ConnEvent.Type {
-		case rpc.ConnEventStderr:
-			prefix = "[stderr]"
-		case rpc.ConnEventDebug:
-			prefix = "[debug3]"
-		case rpc.ConnEventUpload:
-			if level < safcm.LogInfo {
-				return
-			}
-			prefix = "[info]"
-			x.ConnEvent.Data = "remote helper upload in progress"
-		default:
-			prefix = fmt.Sprintf("[INVALID=%d]", x.ConnEvent.Type)
-			color = ColorRed
-		}
-		data = x.ConnEvent.Data
-	}
-
-	host := x.Host.Name()
-	if color != 0 {
-		host = ColorString(isTTY, color, host)
-	}
-	// Make sure to escape control characters to prevent terminal
-	// injection attacks
-	if !x.Escaped {
-		data = EscapeControlCharacters(isTTY, data)
-	}
-	log.Printf("%-9s [%s] %s", prefix, host, data)
-}
-
 func (s *Sync) Name() string {
 	return s.host.Name
 }
@@ -332,25 +249,3 @@ func (s *Sync) logDebugf(format string, a ...interface{}) {
 func (s *Sync) logVerbosef(format string, a ...interface{}) {
 	s.log(safcm.LogVerbose, false, fmt.Sprintf(format, a...))
 }
-
-// sendRecv sends a message over conn and waits for the response. Any MsgLog
-// messages received before the final (non MsgLog) response are passed to
-// s.log.
-func (s *Sync) sendRecv(conn *rpc.Conn, msg safcm.Msg) (safcm.Msg, error) {
-	err := conn.Send(msg)
-	if err != nil {
-		return nil, err
-	}
-	for {
-		x, err := conn.Recv()
-		if err != nil {
-			return nil, err
-		}
-		log, ok := x.(safcm.MsgLog)
-		if ok {
-			s.log(log.Level, false, log.Text)
-			continue
-		}
-		return x, nil
-	}
-}