diff options
author | zeripath <art27@cantab.net> | 2019-02-03 02:06:52 +0000 |
---|---|---|
committer | techknowlogick <matti@mdranta.net> | 2019-02-02 21:06:52 -0500 |
commit | 3d91bb2f2dc8584b76a49a1a40c3f688c21380f5 (patch) | |
tree | 5f5641012972139a1fb179a5415cab38c222a68a /modules/mailer | |
parent | 67567eff0e5614553cbd396ae7e1adfde6fa33c0 (diff) | |
download | gitea-3d91bb2f2dc8584b76a49a1a40c3f688c21380f5.tar.gz gitea-3d91bb2f2dc8584b76a49a1a40c3f688c21380f5.zip |
Make log mailer for testing (#5893)
* Create log mailer for testing email settings
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Switch on the log mailer for the integration tests
This ensures that the sending mail process works
Signed-off-by: Andrew Thornton <art27@cantab.net>
* rename the from user for mysql/mssql
* rename log sender to dummy sender
* update the integration tests
Diffstat (limited to 'modules/mailer')
-rw-r--r-- | modules/mailer/mailer.go | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index e9b752e14d..6f4c9488d5 100644 --- a/modules/mailer/mailer.go +++ b/modules/mailer/mailer.go @@ -6,6 +6,7 @@ package mailer import ( + "bytes" "crypto/tls" "fmt" "io" @@ -237,6 +238,20 @@ func (s *sendmailSender) Send(from string, to []string, msg io.WriterTo) error { } } +// Sender sendmail mail sender +type dummySender struct { +} + +// Send send email +func (s *dummySender) Send(from string, to []string, msg io.WriterTo) error { + buf := bytes.Buffer{} + if _, err := msg.WriteTo(&buf); err != nil { + return err + } + log.Info("Mail From: %s To: %v Body: %s", from, to, buf.String()) + return nil +} + func processMailQueue() { for { select { @@ -265,10 +280,13 @@ func NewContext() { return } - if setting.MailService.UseSendmail { - Sender = &sendmailSender{} - } else { + switch setting.MailService.MailerType { + case "smtp": Sender = &smtpSender{} + case "sendmail": + Sender = &sendmailSender{} + case "dummy": + Sender = &dummySender{} } mailQueue = make(chan *Message, setting.MailService.QueueLength) |