blacklight
/
aerc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error handling in maildir worker

This commit is contained in:
Nicolai Dagestad 2019-07-19 20:13:42 +02:00 committed by Drew DeVault
parent 66d916aa7b
commit d526786c93
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
worker/maildir/worker.go
View File

@ -61,6 +61,8 @@ func (w *Worker) handleAction(action types.WorkerMessage) {
Message: types.RespondTo(msg), Message: types.RespondTo(msg),
Error: err, Error: err,
}, nil) }, nil)
} else {
w.done(msg)
} }
} }
@ -136,7 +138,6 @@ func (w *Worker) handleMessage(msg types.WorkerMessage) error {
} }
func (w *Worker) handleConfigure(msg *types.Configure) error { func (w *Worker) handleConfigure(msg *types.Configure) error {
defer w.done(msg)
u, err := url.Parse(msg.Config.Source) u, err := url.Parse(msg.Config.Source)
if err != nil { if err != nil {
w.worker.Logger.Printf("error configuring maildir worker: %v", err) w.worker.Logger.Printf("error configuring maildir worker: %v", err)
@ -156,12 +157,10 @@ func (w *Worker) handleConfigure(msg *types.Configure) error {
} }
func (w *Worker) handleConnect(msg *types.Connect) error { func (w *Worker) handleConnect(msg *types.Connect) error {
w.done(msg)
return nil return nil
} }
func (w *Worker) handleListDirectories(msg *types.ListDirectories) error { func (w *Worker) handleListDirectories(msg *types.ListDirectories) error {
defer w.done(msg)
dirs, err := w.c.ListFolders() dirs, err := w.c.ListFolders()
if err != nil { if err != nil {
w.worker.Logger.Printf("error listing directories: %v", err) w.worker.Logger.Printf("error listing directories: %v", err)
@ -180,7 +179,6 @@ func (w *Worker) handleListDirectories(msg *types.ListDirectories) error {
} }
func (w *Worker) handleOpenDirectory(msg *types.OpenDirectory) error { func (w *Worker) handleOpenDirectory(msg *types.OpenDirectory) error {
defer w.done(msg)
w.worker.Logger.Printf("opening %s", msg.Directory) w.worker.Logger.Printf("opening %s", msg.Directory)
// remove existing watch path // remove existing watch path
@ -225,7 +223,6 @@ func (w *Worker) handleOpenDirectory(msg *types.OpenDirectory) error {
func (w *Worker) handleFetchDirectoryContents( func (w *Worker) handleFetchDirectoryContents(
msg *types.FetchDirectoryContents) error { msg *types.FetchDirectoryContents) error {
defer w.done(msg)
uids, err := w.c.UIDs(*w.selected) uids, err := w.c.UIDs(*w.selected)
if err != nil { if err != nil {
w.worker.Logger.Printf("error scanning uids: %v", err) w.worker.Logger.Printf("error scanning uids: %v", err)
@ -240,7 +237,6 @@ func (w *Worker) handleFetchDirectoryContents(
func (w *Worker) handleCreateDirectory(msg *types.CreateDirectory) error { func (w *Worker) handleCreateDirectory(msg *types.CreateDirectory) error {
dir := w.c.Dir(msg.Directory) dir := w.c.Dir(msg.Directory)
defer w.done(msg)
if err := dir.Create(); err != nil { if err := dir.Create(); err != nil {
w.worker.Logger.Printf("could not create directory %s: %v", w.worker.Logger.Printf("could not create directory %s: %v",
msg.Directory, err) msg.Directory, err)
@ -251,7 +247,6 @@ func (w *Worker) handleCreateDirectory(msg *types.CreateDirectory) error {
func (w *Worker) handleFetchMessageHeaders( func (w *Worker) handleFetchMessageHeaders(
msg *types.FetchMessageHeaders) error { msg *types.FetchMessageHeaders) error {
defer w.done(msg)
for _, uid := range msg.Uids { for _, uid := range msg.Uids {
m, err := w.c.Message(*w.selected, uid) m, err := w.c.Message(*w.selected, uid)
if err != nil { if err != nil {
@ -275,7 +270,6 @@ func (w *Worker) handleFetchMessageHeaders(
func (w *Worker) handleFetchMessageBodyPart( func (w *Worker) handleFetchMessageBodyPart(
msg *types.FetchMessageBodyPart) error { msg *types.FetchMessageBodyPart) error {
defer w.done(msg)
// get reader // get reader
m, err := w.c.Message(*w.selected, msg.Uid) m, err := w.c.Message(*w.selected, msg.Uid)
@ -319,7 +313,6 @@ func (w *Worker) handleFetchMessageBodyPart(
} }
func (w *Worker) handleFetchFullMessages(msg *types.FetchFullMessages) error { func (w *Worker) handleFetchFullMessages(msg *types.FetchFullMessages) error {
defer w.done(msg)
for _, uid := range msg.Uids { for _, uid := range msg.Uids {
m, err := w.c.Message(*w.selected, uid) m, err := w.c.Message(*w.selected, uid)
if err != nil { if err != nil {
@ -343,7 +336,6 @@ func (w *Worker) handleFetchFullMessages(msg *types.FetchFullMessages) error {
} }
func (w *Worker) handleDeleteMessages(msg *types.DeleteMessages) error { func (w *Worker) handleDeleteMessages(msg *types.DeleteMessages) error {
defer w.done(msg)
deleted, err := w.c.DeleteAll(*w.selected, msg.Uids) deleted, err := w.c.DeleteAll(*w.selected, msg.Uids)
if len(deleted) > 0 { if len(deleted) > 0 {
w.worker.PostMessage(&types.MessagesDeleted{ w.worker.PostMessage(&types.MessagesDeleted{
@ -359,7 +351,6 @@ func (w *Worker) handleDeleteMessages(msg *types.DeleteMessages) error {
} }
func (w *Worker) handleReadMessages(msg *types.ReadMessages) error { func (w *Worker) handleReadMessages(msg *types.ReadMessages) error {
defer w.done(msg)
for _, uid := range msg.Uids { for _, uid := range msg.Uids {
m, err := w.c.Message(*w.selected, uid) m, err := w.c.Message(*w.selected, uid)
if err != nil { if err != nil {
@ -387,13 +378,15 @@ func (w *Worker) handleReadMessages(msg *types.ReadMessages) error {
} }
func (w *Worker) handleCopyMessages(msg *types.CopyMessages) error { func (w *Worker) handleCopyMessages(msg *types.CopyMessages) error {
defer w.done(msg)
dest := w.c.Dir(msg.Destination) dest := w.c.Dir(msg.Destination)
return w.c.CopyAll(dest, *w.selected, msg.Uids) err := w.c.CopyAll(dest, *w.selected, msg.Uids)
if err != nil {
return err
}
return nil
} }
func (w *Worker) handleAppendMessage(msg *types.AppendMessage) error { func (w *Worker) handleAppendMessage(msg *types.AppendMessage) error {
defer w.done(msg)
dest := w.c.Dir(msg.Destination) dest := w.c.Dir(msg.Destination)
delivery, err := dest.NewDelivery() delivery, err := dest.NewDelivery()
if err != nil { if err != nil {