Misc cleanup

This commit is contained in:
Joel Elkins 2022-08-13 23:10:33 -05:00
parent 71f830887e
commit f09272d4a3
No known key found for this signature in database
GPG Key ID: 133589DC38921AE2

View File

@ -23,6 +23,7 @@ package cmd
import (
"fmt"
"strconv"
"sync"
"time"
@ -33,17 +34,12 @@ import (
"golang.org/x/exp/slices"
)
type runner struct{
GetSet func(*container.Container) command.CommandSet
GroupScale int
}
func execForEach(tgts []container.Container, getSet func(*container.Container) command.CommandSet, groupScale int) {
var ser sync.Mutex // serialize non-async containers
runLevel := make(map[int][]container.Container)
for i := range tgts {
rl := int(tgts[i].StartGroup * groupScale)
rl := tgts[i].StartGroup * groupScale
runLevel[rl] = append(runLevel[rl], tgts[i])
}
@ -53,7 +49,13 @@ func execForEach(tgts []container.Container, getSet func(*container.Container) c
for _, r := range rls {
cs := runLevel[r]
ser.Lock()
fmt.Fprintln(output, "*** Running a command set for group", r, mapNames(cs))
var dispScale string
if groupScale == 0 {
dispScale = "<all>"
} else {
dispScale = strconv.Itoa(r / groupScale)
}
fmt.Fprintln(output, "*** Running a command set for group", dispScale, mapNames(cs))
go func(async bool, conts []container.Container, ser *sync.Mutex) {
var wg sync.WaitGroup
defer func() {
@ -94,4 +96,3 @@ func mapNames(conts []container.Container) string {
}
return fmt.Sprintf("%v", names)
}