fix: Restore terminal on interrupt when connecting (#1312)

kylecarbs · web-flow · commit 914a2f477ccc · 2022-05-05T20:11:44.000-05:00
Fixes #1292.
diff --git a/cli/cliui/agent.go b/cli/cliui/agent.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"os"
+	"os/signal"
 	"sync"
 	"time"
 
@@ -46,6 +48,23 @@ func Agent(ctx context.Context, writer io.Writer, opts AgentOptions) error {
 	spin.Start()
 	defer spin.Stop()
 
+	ctx, cancelFunc := context.WithCancel(ctx)
+	defer cancelFunc()
+	stopSpin := make(chan os.Signal, 1)
+	signal.Notify(stopSpin, os.Interrupt)
+	defer signal.Stop(stopSpin)
+	go func() {
+		select {
+		case <-ctx.Done():
+			return
+		case <-stopSpin:
+		}
+		signal.Stop(stopSpin)
+		spin.Stop()
+		// nolint:revive
+		os.Exit(1)
+	}()
+
 	ticker := time.NewTicker(opts.FetchInterval)
 	defer ticker.Stop()
 	timer := time.NewTimer(opts.WarnInterval)
diff --git a/provisionerd/provisionerd.go b/provisionerd/provisionerd.go
@@ -845,7 +845,7 @@ func (p *Server) failActiveJob(failedJob *proto.FailedJob) {
 		return
 	}
 	if p.jobFailed.Load() {
-		p.opts.Logger.Warn(context.Background(), "job has already been marked as failed", slog.F("error_messsage", failedJob.Error))
+		p.opts.Logger.Debug(context.Background(), "job has already been marked as failed", slog.F("error_messsage", failedJob.Error))
 		return
 	}
 	p.jobFailed.Store(true)

Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ func (p Server) failActiveJob(failedJob proto.FailedJob) {`
`845`	`845`	`return`
`846`	`846`	`}`
`847`	`847`	`if p.jobFailed.Load() {`
`848`		`- p.opts.Logger.Warn(context.Background(), "job has already been marked as failed", slog.F("error_messsage", failedJob.Error))`
	`848`	`+ p.opts.Logger.Debug(context.Background(), "job has already been marked as failed", slog.F("error_messsage", failedJob.Error))`
`849`	`849`	`return`
`850`	`850`	`}`
`851`	`851`	`p.jobFailed.Store(true)`