Commitf3fd256

committed

fix: Restore terminal on interrupt when connecting

1 parent568574c commitf3fd256Copy full SHA for f3fd256

File tree

+18

-0

lines changed

+18

-0

lines changed

Lines changed: 18 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,22 @@ func Agent(ctx context.Context, writer io.Writer, opts AgentOptions) error {`
`46`	`48`	`spin.Start()`
`47`	`49`	`deferspin.Stop()`
`48`	`50`
	`51`	`+ctx,cancelFunc:=context.WithCancel(ctx)`
	`52`	`+defercancelFunc()`
	`53`	`+stopSpin:=make(chan os.Signal,1)`
	`54`	`+signal.Notify(stopSpin,os.Interrupt)`
	`55`	`+defersignal.Stop(stopSpin)`
	`56`	`+gofunc() {`
	`57`	`+select {`
	`58`	`+case<-ctx.Done():`
	`59`	`+return`
	`60`	`+case<-stopSpin:`
	`61`	`+}`
	`62`	`+signal.Stop(stopSpin)`
	`63`	`+spin.Stop()`
	`64`	`+os.Exit(1)`
	`65`	`+}()`
	`66`	`+`
`49`	`67`	`ticker:=time.NewTicker(opts.FetchInterval)`
`50`	`68`	`deferticker.Stop()`
`51`	`69`	`timer:=time.NewTimer(opts.WarnInterval)`

Comments

(0)