cleanup: Don't pass the settings object to the SMTP backend

Issue #6
create-reload-action
Lukasz Janyst 4 years ago
parent 95070d752b
commit 2be9e5f658
No known key found for this signature in database
GPG Key ID: 32DE641041F17A9A
  1. 2
      pkg/bridge/bridge.go
  2. 10
      pkg/smtp/backend.go

@ -141,7 +141,7 @@ func (b *Bridge) Run() error {
} }
imapBackend := imap.NewIMAPBackend(b.listener, b.cacheProvider, b.settings, b.Users) imapBackend := imap.NewIMAPBackend(b.listener, b.cacheProvider, b.settings, b.Users)
smtpBackend := smtp.NewSMTPBackend(b.listener, b.settings, b.Users) smtpBackend := smtp.NewSMTPBackend(b.listener, b.Users)
go func() { go func() {
imapPort := b.settings.GetInt(settings.IMAPPortKey) imapPort := b.settings.GetInt(settings.IMAPPortKey)

@ -27,13 +27,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
type settingsProvider interface {
GetBool(string) bool
}
type smtpBackend struct { type smtpBackend struct {
eventListener listener.Listener eventListener listener.Listener
settings settingsProvider
users *users.Users users *users.Users
sendRecorder *sendRecorder sendRecorder *sendRecorder
} }
@ -41,20 +36,17 @@ type smtpBackend struct {
// NewSMTPBackend returns struct implementing go-smtp/backend interface. // NewSMTPBackend returns struct implementing go-smtp/backend interface.
func NewSMTPBackend( func NewSMTPBackend(
eventListener listener.Listener, eventListener listener.Listener,
settings settingsProvider,
users *users.Users, users *users.Users,
) *smtpBackend { //nolint[golint] ) *smtpBackend { //nolint[golint]
return newSMTPBackend(eventListener, settings, users) return newSMTPBackend(eventListener, users)
} }
func newSMTPBackend( func newSMTPBackend(
eventListener listener.Listener, eventListener listener.Listener,
settings settingsProvider,
users *users.Users, users *users.Users,
) *smtpBackend { ) *smtpBackend {
return &smtpBackend{ return &smtpBackend{
eventListener: eventListener, eventListener: eventListener,
settings: settings,
users: users, users: users,
sendRecorder: newSendRecorder(), sendRecorder: newSendRecorder(),
} }

Loading…
Cancel
Save