yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

fix(GODT-2814): Server Manager shutdown task cancel

Browse Source
This commit is contained in:
Leander Beernaert
2023-08-14 11:04:53 +02:00
parent 41c125f65e
commit 29f44fc312
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/services/imapsmtpserver/service.go
View File

@ -283,8 +283,6 @@ func (sm *Service) handleLoadedUserCountChange(ctx context.Context) {
} }
func (sm *Service) handleClose(ctx context.Context) { func (sm *Service) handleClose(ctx context.Context) {
sm.tasks.Cancel()
// Close the IMAP server. // Close the IMAP server.
if err := sm.closeIMAPServer(ctx); err != nil { if err := sm.closeIMAPServer(ctx); err != nil {
logrus.WithError(err).Error("Failed to close IMAP server") logrus.WithError(err).Error("Failed to close IMAP server")
@ -294,6 +292,10 @@ func (sm *Service) handleClose(ctx context.Context) {
if err := sm.closeSMTPServer(ctx); err != nil { if err := sm.closeSMTPServer(ctx); err != nil {
logrus.WithError(err).Error("Failed to close SMTP server") logrus.WithError(err).Error("Failed to close SMTP server")
} }
// Cancel and wait needs to be called here since the SMTP server does not have a way to exit
// the task on context cancellation. Therefor we need to wait here after we issued a close request.
sm.tasks.CancelAndWait()
} }
func (sm *Service) handleAddIMAPUser(ctx context.Context, func (sm *Service) handleAddIMAPUser(ctx context.Context,