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

Other: Don't close IMAP/SMTP listeners if they could not be created

Browse Source
This commit is contained in:
James Houlahan
2022-10-25 15:54:23 +02:00
parent 1919610793
commit afc5307a23
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/bridge/imap.go
View File

@ -74,9 +74,11 @@ func (bridge *Bridge) closeIMAP(ctx context.Context) error {
return fmt.Errorf("failed to close IMAP server: %w", err) return fmt.Errorf("failed to close IMAP server: %w", err)
} }
if bridge.imapListener != nil {
if err := bridge.imapListener.Close(); err != nil { if err := bridge.imapListener.Close(); err != nil {
return fmt.Errorf("failed to close IMAP listener: %w", err) return fmt.Errorf("failed to close IMAP listener: %w", err)
} }
}
return nil return nil
} }

2
internal/bridge/smtp.go
View File

@ -67,9 +67,11 @@ func (bridge *Bridge) restartSMTP() error {
// after we've already closed the server. However, go-smtp has a bug; it blocks on the listener // after we've already closed the server. However, go-smtp has a bug; it blocks on the listener
// even after the server has been closed. So we close the listener ourselves to unblock it. // even after the server has been closed. So we close the listener ourselves to unblock it.
func (bridge *Bridge) closeSMTP() error { func (bridge *Bridge) closeSMTP() error {
if bridge.smtpListener != nil {
if err := bridge.smtpListener.Close(); err != nil { if err := bridge.smtpListener.Close(); err != nil {
return fmt.Errorf("failed to close SMTP listener: %w", err) return fmt.Errorf("failed to close SMTP listener: %w", err)
} }
}
if err := bridge.smtpServer.Close(); err != nil { if err := bridge.smtpServer.Close(); err != nil {
logrus.WithError(err).Debug("Failed to close SMTP server") logrus.WithError(err).Debug("Failed to close SMTP server")