aboutsummaryrefslogtreecommitdiffstats
path: root/main.go
diff options
context:
space:
mode:
authorRobin Jarry <robin@jarry.cc>2024-01-27 21:36:25 +0100
committerRobin Jarry <robin@jarry.cc>2024-01-31 16:08:45 +0100
commitfd4dd42408856048dd71f83ae1f30e2ab84621da (patch)
tree6ae89fff21d1100d814249545170b7d572bb8740 /main.go
parent4998406cce859791013880ec5f8f402007a2d1bd (diff)
downloadaerc-fd4dd42408856048dd71f83ae1f30e2ab84621da.tar.gz
ipc: wait for app to be ready before accepting commands
Pass a cancellable context to the IPC server and defer accepting connections until the first worker message has been received by the main thread. This is not a real fix for the :split command not working at startup. :split requires a mail store to be present on the currently selected account tab+folder. I could have waited for a types.DirectoryContents message but it seems silly and bug prone since such a message may never arrive and we don't want to pool IPC messages forever. Also, a types.DirectoryContents message may arrive for one account but :split is only effective *per account* and the default selected account tab is the first one. In any case, this band aid prevents aerc from crashing or breaking down the terminal when running IPC commands in the aerc-startup hook. Fixes: https://lists.sr.ht/~rjarry/aerc-devel/%3CCYPN7AVYQ69S.WV0T67VM6WX3%40wegtam.com%3E Fixes: https://todo.sr.ht/~rjarry/aerc/173 Reported-by: Jens Grassel <jens@wegtam.com> Reported-by: Justine Smithies <justine@smithies.me.uk> Signed-off-by: Robin Jarry <robin@jarry.cc> Tested-by: Thomas Böhler <witcher@wiredspace.de> Reviewed-by: Thomas Böhler <witcher@wiredspace.de>
Diffstat (limited to 'main.go')
-rw-r--r--main.go12
1 files changed, 11 insertions, 1 deletions
diff --git a/main.go b/main.go
index 06178d2d..5d79428d 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,7 @@ package main
import (
"bytes"
+ "context"
"encoding/base64"
"errors"
"fmt"
@@ -10,6 +11,7 @@ import (
"runtime"
"sort"
"strings"
+ "sync"
"time"
"git.sr.ht/~rjarry/go-opt"
@@ -225,8 +227,9 @@ func main() {
if config.Ui.MouseEnabled {
ui.EnableMouse()
}
+ startup, startupDone := context.WithCancel(context.Background())
- as, err := ipc.StartServer(app.IPCHandler())
+ as, err := ipc.StartServer(app.IPCHandler(), startup)
if err != nil {
log.Warnf("Failed to start Unix server: %v", err)
} else {
@@ -269,6 +272,7 @@ func main() {
log.Errorf("aerc-shutdown hook: %s", err)
}
}(time.Now())
+ var once sync.Once
loop:
for {
select {
@@ -276,6 +280,12 @@ loop:
ui.HandleEvent(event)
case msg := <-types.WorkerMessages:
app.HandleMessage(msg)
+ // XXX: The app may not be 100% ready at this point.
+ // The issue is that there is no real way to tell when
+ // it will be ready. And in some cases, it may never be.
+ // At least, we can be confident that accepting IPC
+ // commands will not crash the whole process.
+ once.Do(startupDone)
case callback := <-ui.Callbacks:
callback()
case <-ui.Redraw: