diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/open.go | 4 | ||||
| -rw-r--r-- | lib/socket.go | 9 | ||||
| -rw-r--r-- | lib/ui/ui.go | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/lib/open.go b/lib/open.go index 8a016eb3..f395d13d 100644 --- a/lib/open.go +++ b/lib/open.go @@ -3,6 +3,8 @@ package lib import ( "os/exec" "runtime" + + "git.sr.ht/~rjarry/aerc/logging" ) var openBin string = "xdg-open" @@ -49,6 +51,8 @@ func (xdg *xdgOpen) Start() error { return err } go func() { + defer logging.PanicHandler() + xdg.errCh <- xdg.cmd.Wait() close(xdg.errCh) }() diff --git a/lib/socket.go b/lib/socket.go index 814dce12..ae1ce339 100644 --- a/lib/socket.go +++ b/lib/socket.go @@ -13,6 +13,7 @@ import ( "sync/atomic" "time" + "git.sr.ht/~rjarry/aerc/logging" "github.com/kyoh86/xdg" ) @@ -36,6 +37,8 @@ func StartServer(logger *log.Logger) (*AercServer, error) { } // TODO: stash clients and close them on exit... bleh racey go func() { + defer logging.PanicHandler() + for { conn, err := l.Accept() if err != nil { @@ -44,7 +47,11 @@ func StartServer(logger *log.Logger) (*AercServer, error) { as.logger.Printf("Closing Unix server: %v", err) return } - go as.handleClient(conn) + go func() { + defer logging.PanicHandler() + + as.handleClient(conn) + }() } }() return as, nil diff --git a/lib/ui/ui.go b/lib/ui/ui.go index 66c2a054..b65c06a4 100644 --- a/lib/ui/ui.go +++ b/lib/ui/ui.go @@ -3,6 +3,7 @@ package ui import ( "sync/atomic" + "git.sr.ht/~rjarry/aerc/logging" "github.com/gdamore/tcell/v2" ) @@ -43,6 +44,8 @@ func Initialize(content DrawableInteractive) (*UI, error) { state.exit.Store(false) go func() { + defer logging.PanicHandler() + for !state.ShouldExit() { state.tcEvents <- screen.PollEvent() } |