Commit60142d8

committed

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

1 parent6236ff4 commit60142d8Copy full SHA for 60142d8

File tree

+20

-1

lines changed

+20

-1

lines changed

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`	`6`	`"io"`
	`7`	`+"os"`
	`8`	`+"os/signal"`
`7`	`9`	`"sync"`
`8`	`10`	`"time"`
`9`	`11`
`@@ -46,6 +48,23 @@ func Agent(ctx context.Context, writer io.Writer, opts AgentOptions) error {`
`46`	`48`	`spin.Start()`
`47`	`49`	`defer spin.Stop()`
`48`	`50`
	`51`	`+ctx, cancelFunc := context.WithCancel(ctx)`
	`52`	`+defer cancelFunc()`
	`53`	`+stopSpin := make(chan os.Signal, 1)`
	`54`	`+signal.Notify(stopSpin, os.Interrupt)`
	`55`	`+defer signal.Stop(stopSpin)`
	`56`	`+go func() {`
	`57`	`+select {`
	`58`	`+case <-ctx.Done():`
	`59`	`+return`
	`60`	`+case <-stopSpin:`
	`61`	`+}`
	`62`	`+signal.Stop(stopSpin)`
	`63`	`+spin.Stop()`
	`64`	`+// nolint:revive`
	`65`	`+os.Exit(1)`
	`66`	`+}()`
	`67`	`+`
`49`	`68`	`ticker := time.NewTicker(opts.FetchInterval)`
`50`	`69`	`defer ticker.Stop()`
`51`	`70`	`timer := time.NewTimer(opts.WarnInterval)`

Lines changed: 1 addition & 1 deletion

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)`

Comments

(0)