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

feat(GODT-3146): remove unused

Browse Source
This commit is contained in:
Jakub
2024-03-13 14:31:53 +01:00
parent 921a44f1a3
commit cb436fff63
1 changed files with 15 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,8 @@ type Service struct {
panicHandler async.PanicHandler panicHandler async.PanicHandler
reporter reporter.Reporter reporter reporter.Reporter
loadedUserCount int log *logrus.Entry
log *logrus.Entry tasks *async.Group
tasks *async.Group
uidValidityGenerator imap.UIDValidityGenerator uidValidityGenerator imap.UIDValidityGenerator
telemetry Telemetry telemetry Telemetry
@ -265,30 +264,16 @@ func (sm *Service) run(ctx context.Context, subscription events.Subscription) {
} }
func (sm *Service) handleLoadedUserCountChange(ctx context.Context) { func (sm *Service) handleLoadedUserCountChange(ctx context.Context) {
sm.log.Infof("Validating Listener State %v", sm.loadedUserCount) sm.log.Infof("Validating Listener State")
if sm.shouldStartServers() { if sm.imapListener == nil {
if sm.imapListener == nil { if err := sm.serveIMAP(ctx); err != nil {
if err := sm.serveIMAP(ctx); err != nil { sm.log.WithError(err).Error("Failed to start IMAP server")
sm.log.WithError(err).Error("Failed to start IMAP server")
}
} }
}
if sm.smtpListener == nil { if sm.smtpListener == nil {
if err := sm.restartSMTP(ctx); err != nil { if err := sm.restartSMTP(ctx); err != nil {
sm.log.WithError(err).Error("Failed to start SMTP server") sm.log.WithError(err).Error("Failed to start SMTP server")
}
}
} else {
if sm.imapListener != nil {
if err := sm.stopIMAPListener(ctx); err != nil {
sm.log.WithError(err).Error("Failed to stop IMAP server")
}
}
if sm.smtpListener != nil {
if err := sm.closeSMTPServer(ctx); err != nil {
sm.log.WithError(err).Error("Failed to stop SMTP server")
}
} }
} }
} }
@ -317,12 +302,7 @@ func (sm *Service) handleAddIMAPUser(ctx context.Context,
) error { ) error {
// Due to the many different error exits, performer user count change at this stage rather we split the incrementing // Due to the many different error exits, performer user count change at this stage rather we split the incrementing
// of users from the logic. // of users from the logic.
err := sm.handleAddIMAPUserImpl(ctx, connector, addrID, idProvider, syncStateProvider) return sm.handleAddIMAPUserImpl(ctx, connector, addrID, idProvider, syncStateProvider)
if err == nil {
sm.loadedUserCount++
}
return err
} }
func (sm *Service) handleAddIMAPUserImpl(ctx context.Context, func (sm *Service) handleAddIMAPUserImpl(ctx context.Context,
@ -446,8 +426,6 @@ func (sm *Service) handleRemoveIMAPUser(ctx context.Context, withData bool, idPr
return fmt.Errorf("failed to remove IMAP user ID: %w", err) return fmt.Errorf("failed to remove IMAP user ID: %w", err)
} }
} }
sm.loadedUserCount--
} }
return nil return nil
@ -552,11 +530,7 @@ func (sm *Service) restartIMAP(ctx context.Context) error {
sm.eventPublisher.PublishEvent(ctx, events.IMAPServerStopped{}) sm.eventPublisher.PublishEvent(ctx, events.IMAPServerStopped{})
} }
if sm.shouldStartServers() { return sm.serveIMAP(ctx)
return sm.serveIMAP(ctx)
}
return nil
} }
func (sm *Service) restartSMTP(ctx context.Context) error { func (sm *Service) restartSMTP(ctx context.Context) error {
@ -570,11 +544,7 @@ func (sm *Service) restartSMTP(ctx context.Context) error {
sm.smtpServer = newSMTPServer(sm.smtpAccounts, sm.smtpSettings) sm.smtpServer = newSMTPServer(sm.smtpAccounts, sm.smtpSettings)
if sm.shouldStartServers() { return sm.serveSMTP(ctx)
return sm.serveSMTP(ctx)
}
return nil
} }
func (sm *Service) serveSMTP(ctx context.Context) error { func (sm *Service) serveSMTP(ctx context.Context) error {
@ -689,8 +659,6 @@ func (sm *Service) handleSetGluonDir(ctx context.Context, newGluonDir string) er
return fmt.Errorf("failed to close IMAP: %w", err) return fmt.Errorf("failed to close IMAP: %w", err)
} }
sm.loadedUserCount = 0
if err := moveGluonCacheDir(sm.imapSettings, currentGluonDir, newGluonDir); err != nil { if err := moveGluonCacheDir(sm.imapSettings, currentGluonDir, newGluonDir); err != nil {
sm.log.WithError(err).Error("failed to move GluonCacheDir") sm.log.WithError(err).Error("failed to move GluonCacheDir")
@ -710,19 +678,13 @@ func (sm *Service) handleSetGluonDir(ctx context.Context, newGluonDir string) er
sm.imapServer = imapServer sm.imapServer = imapServer
if sm.shouldStartServers() { if err := sm.serveIMAP(ctx); err != nil {
if err := sm.serveIMAP(ctx); err != nil { return fmt.Errorf("failed to serve IMAP: %w", err)
return fmt.Errorf("failed to serve IMAP: %w", err)
}
} }
return nil return nil
} }
func (sm *Service) shouldStartServers() bool {
return true // sm.loadedUserCount >= 1
}
type smRequestClose struct{} type smRequestClose struct{}
type smRequestRestartIMAP struct{} type smRequestRestartIMAP struct{}