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

Revert "imap: attempt automatic reconnection on error"

Browse source 
This reverts commit c605ada3dd.

This breaks reading message bodies. I am not sure why, I'll take some
time to fix it later.

Signed-off-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Robin Jarry 2022-01-15 12:07:02 +01:00
parent 4d7d01b3f0
commit 899d1cca3c
1 changed files with 3 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
worker/imap/worker.go
View file

@ -56,10 +56,6 @@ type IMAPWorker struct {
worker *types.Worker worker *types.Worker
// Map of sequence numbers to UIDs, index 0 is seq number 1 // Map of sequence numbers to UIDs, index 0 is seq number 1
seqMap []uint32 seqMap []uint32
// automatic reconnect
loggingOut bool
loggedOut <-chan struct{}
reconnecting bool
} }
func NewIMAPWorker(worker *types.Worker) (types.Backend, error) { func NewIMAPWorker(worker *types.Worker) (types.Backend, error) {
@ -73,10 +69,7 @@ func NewIMAPWorker(worker *types.Worker) (types.Backend, error) {
func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error { func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
if w.client != nil && w.client.State() == imap.SelectedState { if w.client != nil && w.client.State() == imap.SelectedState {
if w.idleStop != nil {
close(w.idleStop) close(w.idleStop)
w.idleStop = nil
}
if err := <-w.idleDone; err != nil { if err := <-w.idleDone; err != nil {
w.worker.PostMessage(&types.Error{Error: err}, nil) w.worker.PostMessage(&types.Error{Error: err}, nil)
} }
@ -162,27 +155,21 @@ func (w *IMAPWorker) handleMessage(msg types.WorkerMessage) error {
} }
} }
case *types.Connect: case *types.Connect:
if w.client != nil && w.client.State() == imap.SelectedState && !w.reconnecting { if w.client != nil && w.client.State() == imap.SelectedState {
return fmt.Errorf("Already connected") return fmt.Errorf("Already connected")
} }
w.loggingOut = false
c, err := w.connect() c, err := w.connect()
if err != nil { if err != nil {
if !w.reconnecting {
go w.tryReconnect()
}
return err return err
} }
c.Updates = w.updates c.Updates = w.updates
w.loggedOut = c.LoggedOut()
w.client = &imapClient{c, sortthread.NewThreadClient(c), sortthread.NewSortClient(c)} w.client = &imapClient{c, sortthread.NewThreadClient(c), sortthread.NewSortClient(c)}
w.worker.PostMessage(&types.Done{types.RespondTo(msg)}, nil) w.worker.PostMessage(&types.Done{types.RespondTo(msg)}, nil)
case *types.Disconnect: case *types.Disconnect:
w.reconnecting = false
if w.client == nil || w.client.State() != imap.SelectedState { if w.client == nil || w.client.State() != imap.SelectedState {
return fmt.Errorf("Not connected") return fmt.Errorf("Not connected")
} }
w.loggingOut = true
if err := w.client.Logout(); err != nil { if err := w.client.Logout(); err != nil {
return err return err
} }
@ -391,25 +378,6 @@ func (w *IMAPWorker) setKeepaliveParameters(conn *net.TCPConn) error {
return err return err
} }
func (w *IMAPWorker) tryReconnect() {
w.reconnecting = true
for w.reconnecting {
w.worker.Logger.Printf("IMAP reconnection in 2 seconds...\n")
time.Sleep(2 * time.Second)
c := make(chan types.WorkerMessage)
w.worker.PostAction(&types.Connect{}, func(m types.WorkerMessage) {
c <- m
})
result := <-c
switch result.(type) {
case *types.Done:
w.reconnecting = false
case *types.Error:
w.worker.Logger.Printf("IMAP connection failed\n")
}
}
}
func (w *IMAPWorker) Run() { func (w *IMAPWorker) Run() {
for { for {
select { select {
@ -427,12 +395,6 @@ func (w *IMAPWorker) Run() {
} }
case update := <-w.updates: case update := <-w.updates:
w.handleImapUpdate(update) w.handleImapUpdate(update)
case <-w.loggedOut:
w.loggedOut = nil
if !w.loggingOut && !w.reconnecting {
w.reconnecting = true
go w.tryReconnect()
}
} }
} }
} }