X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=cmd%2Fsafcm%2Fsync.go;h=238ed62ae5e50f5f3516847817363a3bf894f8b7;hb=97641dde0b55b588bfd27817a6a9deac3b337513;hp=09ffe854e1e7491727882f963a894ff9c801994e;hpb=f2f2bc47e8729548f3c10117f7f008b547c4afc5;p=safcm%2Fsafcm.git

diff --git a/cmd/safcm/sync.go b/cmd/safcm/sync.go
index 09ffe85..238ed62 100644
--- a/cmd/safcm/sync.go
+++ b/cmd/safcm/sync.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"os/signal"
 	"sort"
 	"strings"
 	"sync"
@@ -71,6 +72,8 @@ func MainSync(args []string) error {
 
 	optionDryRun := flag.Bool("n", false,
 		"dry-run, show diff but don't perform any changes")
+	optionQuiet := flag.Bool("q", false,
+		"hide successful, non-trigger commands with no output from host changes listing")
 	optionLog := flag.String("log", "info", "set log `level`; "+
 		"levels: error, info, verbose, debug, debug2, debug3")
 
@@ -105,6 +108,7 @@ func MainSync(args []string) error {
 		return err
 	}
 	cfg.DryRun = *optionDryRun
+	cfg.Quiet = *optionQuiet
 	cfg.LogLevel = level
 
 	toSync, err := hostsToSync(names, allHosts, allGroups)
@@ -132,6 +136,38 @@ func MainSync(args []string) error {
 		done <- failed
 	}()
 
+	hostsLeft := make(map[string]bool)
+	for _, x := range toSync {
+		hostsLeft[x.Name] = true
+	}
+	var hostsLeftMutex sync.Mutex // protects hostsLeft
+
+	// Show unfinished hosts on Ctrl-C
+	sigint := make(chan os.Signal, 1)   // buffered for Notify()
+	signal.Notify(sigint, os.Interrupt) // = SIGINT = Ctrl-C
+	go func() {
+		// Running `ssh` processes get killed by SIGINT which is sent
+		// to all processes
+
+		<-sigint
+		log.Print("Received SIGINT, aborting ...")
+
+		// Print all queued events
+		events <- Event{} // poison pill
+		<-done
+		// "races" with <-done in the main function and will hang here
+		// if the other is faster. This is fine because then all hosts
+		// were synced successfully.
+
+		hostsLeftMutex.Lock()
+		var hosts []string
+		for x := range hostsLeft {
+			hosts = append(hosts, x)
+		}
+		sort.Strings(hosts)
+		log.Fatalf("Failed to sync %s", strings.Join(hosts, ", "))
+	}()
+
 	// Sync all hosts concurrently
 	var wg sync.WaitGroup
 	for _, x := range toSync {
@@ -157,6 +193,10 @@ func MainSync(args []string) error {
 				}
 			}
 			wg.Done()
+
+			hostsLeftMutex.Lock()
+			defer hostsLeftMutex.Unlock()
+			delete(hostsLeft, x.Name)
 		}()
 	}
 
@@ -183,8 +223,24 @@ func MainSync(args []string) error {
 func hostsToSync(names []string, allHosts *config.Hosts,
 	allGroups map[string][]string) ([]*config.Host, error) {
 
+	detectedMap := make(map[string]bool)
+	for _, x := range config.TransitivelyDetectedGroups(allGroups) {
+		detectedMap[x] = true
+	}
+
+	const detectedErr = `
+
+Groups depending on "detected" groups cannot be used to select hosts as these
+are only available after the hosts were contacted.
+`
+
 	nameMap := make(map[string]bool)
 	for _, x := range names {
+		if detectedMap[x] {
+			return nil, fmt.Errorf(
+				"group %q depends on \"detected\" groups%s",
+				x, detectedErr)
+		}
 		nameMap[x] = true
 	}
 	nameMatched := make(map[string]bool)
@@ -200,8 +256,6 @@ func hostsToSync(names []string, allHosts *config.Hosts,
 			nameMatched[host.Name] = true
 		}
 
-		// TODO: don't permit groups which contain "detected" groups
-		// because these are not available yet
 		groups, err := config.ResolveHostGroups(host.Name,
 			allGroups, nil)
 		if err != nil {
@@ -310,7 +364,7 @@ func (s *Sync) Host(wg *sync.WaitGroup) error {
 	}()
 
 	// Connect to remote host
-	err := conn.DialSSH(s.host.Name)
+	err := conn.DialSSH(s.host.SshUser, s.host.Name)
 	if err != nil {
 		return err
 	}