From 6b41d2b3f07441408ad1c446e5b1cd8e785912dc Mon Sep 17 00:00:00 2001 From: Victor Vrantchan Date: Sat, 24 Dec 2016 10:41:59 -0500 Subject: [PATCH] always print email messages in dev mode (#698) --- server/mail/mail.go | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/server/mail/mail.go b/server/mail/mail.go index d2ad818f71..979e210978 100644 --- a/server/mail/mail.go +++ b/server/mail/mail.go @@ -55,20 +55,10 @@ func getMessageBody(e kolide.Email) ([]byte, error) { } func (dm devMailService) SendEmail(e kolide.Email) error { - if !e.Config.SMTPEnabled { - return fmt.Errorf("email disabled") + msg, err := getMessageBody(e) + if err != nil { + return err } - if e.Config.SMTPConfigured { - msg, err := getMessageBody(e) - if err != nil { - return err - } - fmt.Printf(string(msg)) - } - return nil -} - -func (dm devMailService) sendMail(e kolide.Email, msg []byte) error { fmt.Println(string(msg)) return nil }