diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/account.go | 7 | ||||
| -rw-r--r-- | widgets/dirlist.go | 3 | ||||
| -rw-r--r-- | widgets/msgviewer.go | 9 | ||||
| -rw-r--r-- | widgets/spinner.go | 3 | ||||
| -rw-r--r-- | widgets/status.go | 3 | ||||
| -rw-r--r-- | widgets/terminal.go | 3 |
6 files changed, 27 insertions, 1 deletions
diff --git a/widgets/account.go b/widgets/account.go index 1d319232..55c4f550 100644 --- a/widgets/account.go +++ b/widgets/account.go @@ -13,6 +13,7 @@ import ( "git.sr.ht/~rjarry/aerc/lib/sort" "git.sr.ht/~rjarry/aerc/lib/statusline" "git.sr.ht/~rjarry/aerc/lib/ui" + "git.sr.ht/~rjarry/aerc/logging" "git.sr.ht/~rjarry/aerc/models" "git.sr.ht/~rjarry/aerc/worker" "git.sr.ht/~rjarry/aerc/worker/types" @@ -86,7 +87,11 @@ func NewAccountView(aerc *Aerc, conf *config.AercConfig, acct *config.AccountCon view.msglist = NewMessageList(conf, logger, aerc) view.grid.AddChild(view.msglist).At(0, 1) - go worker.Backend.Run() + go func() { + defer logging.PanicHandler() + + worker.Backend.Run() + }() worker.PostAction(&types.Configure{Config: acct}, nil) worker.PostAction(&types.Connect{}, nil) diff --git a/widgets/dirlist.go b/widgets/dirlist.go index cb22a61c..11e1b208 100644 --- a/widgets/dirlist.go +++ b/widgets/dirlist.go @@ -16,6 +16,7 @@ import ( "git.sr.ht/~rjarry/aerc/lib" libsort "git.sr.ht/~rjarry/aerc/lib/sort" "git.sr.ht/~rjarry/aerc/lib/ui" + "git.sr.ht/~rjarry/aerc/logging" "git.sr.ht/~rjarry/aerc/models" "git.sr.ht/~rjarry/aerc/worker/types" ) @@ -128,6 +129,8 @@ func (dirlist *DirectoryList) Select(name string) { dirlist.skipSelect = make(chan bool) go func() { + defer logging.PanicHandler() + select { case <-time.After(dirlist.UiConfig().DirListDelay): dirlist.worker.PostAction(&types.OpenDirectory{Directory: name}, diff --git a/widgets/msgviewer.go b/widgets/msgviewer.go index 9b40dede..91baf025 100644 --- a/widgets/msgviewer.go +++ b/widgets/msgviewer.go @@ -19,6 +19,7 @@ import ( "git.sr.ht/~rjarry/aerc/lib" "git.sr.ht/~rjarry/aerc/lib/format" "git.sr.ht/~rjarry/aerc/lib/ui" + "git.sr.ht/~rjarry/aerc/logging" "git.sr.ht/~rjarry/aerc/models" ) @@ -600,6 +601,8 @@ func (pv *PartViewer) attemptCopy() { pv.copyFilterOutToPager() //delayed until we write to the sink } go func() { + defer logging.PanicHandler() + pv.writeMailHeaders() if strings.EqualFold(pv.part.MIMEType, "text") { // if the content is plain we can strip ansi control chars @@ -645,6 +648,8 @@ func (pv *PartViewer) copyFilterOutToPager() { pv.filter.Start() ch := make(chan interface{}) go func() { + defer logging.PanicHandler() + _, err := io.Copy(pv.pagerin, stdout) if err != nil { pv.err = err @@ -654,6 +659,8 @@ func (pv *PartViewer) copyFilterOutToPager() { ch <- nil }() go func() { + defer logging.PanicHandler() + _, err := io.Copy(pv.pagerin, stderr) if err != nil { pv.err = err @@ -663,6 +670,8 @@ func (pv *PartViewer) copyFilterOutToPager() { ch <- nil }() go func() { + defer logging.PanicHandler() + <-ch <-ch pv.filter.Wait() diff --git a/widgets/spinner.go b/widgets/spinner.go index 2bd416ac..f2607727 100644 --- a/widgets/spinner.go +++ b/widgets/spinner.go @@ -9,6 +9,7 @@ import ( "git.sr.ht/~rjarry/aerc/config" "git.sr.ht/~rjarry/aerc/lib/ui" + "git.sr.ht/~rjarry/aerc/logging" ) type Spinner struct { @@ -37,6 +38,8 @@ func (s *Spinner) Start() { atomic.StoreInt64(&s.frame, 0) go func() { + defer logging.PanicHandler() + for { select { case <-s.stop: diff --git a/widgets/status.go b/widgets/status.go index c70d215f..6c501b24 100644 --- a/widgets/status.go +++ b/widgets/status.go @@ -8,6 +8,7 @@ import ( "git.sr.ht/~rjarry/aerc/config" "git.sr.ht/~rjarry/aerc/lib/ui" + "git.sr.ht/~rjarry/aerc/logging" ) type StatusLine struct { @@ -78,6 +79,8 @@ func (status *StatusLine) Push(text string, expiry time.Duration) *StatusMessage } status.stack = append(status.stack, msg) go (func() { + defer logging.PanicHandler() + time.Sleep(expiry) for i, m := range status.stack { if m == msg { diff --git a/widgets/terminal.go b/widgets/terminal.go index a9c79884..5baaec23 100644 --- a/widgets/terminal.go +++ b/widgets/terminal.go @@ -7,6 +7,7 @@ import ( "syscall" "git.sr.ht/~rjarry/aerc/lib/ui" + "git.sr.ht/~rjarry/aerc/logging" "github.com/creack/pty" vterm "github.com/ddevault/go-libvterm" @@ -124,6 +125,8 @@ func NewTerminal(cmd *exec.Cmd) (*Terminal, error) { term.start = make(chan interface{}) screen := term.vterm.ObtainScreen() go func() { + defer logging.PanicHandler() + <-term.start buf := make([]byte, 4096) for { |