johno/gastown
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(start): use errors.Is consistently, remove redundant session check

Browse Source 
- Use errors.Is() for all ErrAlreadyRunning comparisons (consistency)
- Remove redundant HasSession check before Start() (was a race anyway)
- Remove unused tmux parameters from startRigAgents and startWitnessForRig

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
jack
2026-01-12 18:00:01 -08:00
committed by Steve Yegge
parent c99b004aeb
commit 1902182f3a
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/cmd/start.go
View File

@@ -198,7 +198,7 @@ func runStart(cmd *cobra.Command, args []string) error {
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
startRigAgents(t, rigs, &mu) startRigAgents(rigs, &mu)
}() }()
} }
@@ -240,7 +240,7 @@ func startCoreAgents(townRoot string, agentOverride string, mu *sync.Mutex) erro
defer wg.Done() defer wg.Done()
mayorMgr := mayor.NewManager(townRoot) mayorMgr := mayor.NewManager(townRoot)
if err := mayorMgr.Start(agentOverride); err != nil { if err := mayorMgr.Start(agentOverride); err != nil {
if err == mayor.ErrAlreadyRunning { if errors.Is(err, mayor.ErrAlreadyRunning) {
mu.Lock() mu.Lock()
fmt.Printf(" %s Mayor already running\n", style.Dim.Render("○")) fmt.Printf(" %s Mayor already running\n", style.Dim.Render("○"))
mu.Unlock() mu.Unlock()
@@ -267,7 +267,7 @@ func startCoreAgents(townRoot string, agentOverride string, mu *sync.Mutex) erro
defer wg.Done() defer wg.Done()
deaconMgr := deacon.NewManager(townRoot) deaconMgr := deacon.NewManager(townRoot)
if err := deaconMgr.Start(agentOverride); err != nil { if err := deaconMgr.Start(agentOverride); err != nil {
if err == deacon.ErrAlreadyRunning { if errors.Is(err, deacon.ErrAlreadyRunning) {
mu.Lock() mu.Lock()
fmt.Printf(" %s Deacon already running\n", style.Dim.Render("○")) fmt.Printf(" %s Deacon already running\n", style.Dim.Render("○"))
mu.Unlock() mu.Unlock()
@@ -294,7 +294,7 @@ func startCoreAgents(townRoot string, agentOverride string, mu *sync.Mutex) erro
// startRigAgents starts witness and refinery for all rigs in parallel. // startRigAgents starts witness and refinery for all rigs in parallel.
// Called when --all flag is passed to gt start. // Called when --all flag is passed to gt start.
func startRigAgents(t *tmux.Tmux, rigs []*rig.Rig, mu *sync.Mutex) { func startRigAgents(rigs []*rig.Rig, mu *sync.Mutex) {
var wg sync.WaitGroup var wg sync.WaitGroup
for _, r := range rigs { for _, r := range rigs {
@@ -303,7 +303,7 @@ func startRigAgents(t *tmux.Tmux, rigs []*rig.Rig, mu *sync.Mutex) {
// Start Witness in goroutine // Start Witness in goroutine
go func(r *rig.Rig) { go func(r *rig.Rig) {
defer wg.Done() defer wg.Done()
msg := startWitnessForRig(t, r) msg := startWitnessForRig(r)
mu.Lock() mu.Lock()
fmt.Print(msg) fmt.Print(msg)
mu.Unlock() mu.Unlock()
@@ -323,16 +323,10 @@ func startRigAgents(t *tmux.Tmux, rigs []*rig.Rig, mu *sync.Mutex) {
} }
// startWitnessForRig starts the witness for a single rig and returns a status message. // startWitnessForRig starts the witness for a single rig and returns a status message.
func startWitnessForRig(t *tmux.Tmux, r *rig.Rig) string { func startWitnessForRig(r *rig.Rig) string {
witnessSession := fmt.Sprintf("gt-%s-witness", r.Name)
witnessRunning, _ := t.HasSession(witnessSession)
if witnessRunning {
return fmt.Sprintf(" %s %s witness already running\n", style.Dim.Render("○"), r.Name)
}
witMgr := witness.NewManager(r) witMgr := witness.NewManager(r)
if err := witMgr.Start(false, "", nil); err != nil { if err := witMgr.Start(false, "", nil); err != nil {
if err == witness.ErrAlreadyRunning { if errors.Is(err, witness.ErrAlreadyRunning) {
return fmt.Sprintf(" %s %s witness already running\n", style.Dim.Render("○"), r.Name) return fmt.Sprintf(" %s %s witness already running\n", style.Dim.Render("○"), r.Name)
} }
return fmt.Sprintf(" %s %s witness failed: %v\n", style.Dim.Render("○"), r.Name, err) return fmt.Sprintf(" %s %s witness failed: %v\n", style.Dim.Render("○"), r.Name, err)