Refactor Email and add more logging

src/NzbDrone.Core/Notifications/Email/Email.cs

@@ -1,20 +1,25 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using FluentValidation.Results;
+using MailKit.Net.Smtp;
+using MailKit.Security;
+using MimeKit;
+using NLog;
 using NzbDrone.Common.Extensions;
-using NzbDrone.Core.Tv;
 
 namespace NzbDrone.Core.Notifications.Email
 {
     public class Email : NotificationBase<EmailSettings>
     {
-        private readonly IEmailService _emailService;
+        private readonly Logger _logger;
 
         public override string Name => "Email";
 
 
-        public Email(IEmailService emailService)
+        public Email(Logger logger)
         {
-            _emailService = emailService;
+            _logger = logger;
         }
 
         public override string Link => null;
@@ -23,42 +28,147 @@ namespace NzbDrone.Core.Notifications.Email
         {
             var body = $"{grabMessage.Message} sent to queue.";
 
-            _emailService.SendEmail(Settings, EPISODE_GRABBED_TITLE_BRANDED, body);
+            SendEmail(Settings, EPISODE_GRABBED_TITLE_BRANDED, body);
         }
 
         public override void OnDownload(DownloadMessage message)
         {
             var body = $"{message.Message} Downloaded and sorted.";
 
-            _emailService.SendEmail(Settings, EPISODE_DOWNLOADED_TITLE_BRANDED, body);
+            SendEmail(Settings, EPISODE_DOWNLOADED_TITLE_BRANDED, body);
         }
 
         public override void OnEpisodeFileDelete(EpisodeDeleteMessage deleteMessage)
         {
             var body = $"{deleteMessage.Message} deleted.";
 
-            _emailService.SendEmail(Settings, EPISODE_DELETED_TITLE_BRANDED, body);
+            SendEmail(Settings, EPISODE_DELETED_TITLE_BRANDED, body);
         }
 
         public override void OnSeriesDelete(SeriesDeleteMessage deleteMessage)
         {
             var body = $"{deleteMessage.Message}";
 
-            _emailService.SendEmail(Settings, SERIES_DELETED_TITLE_BRANDED, body);
+            SendEmail(Settings, SERIES_DELETED_TITLE_BRANDED, body);
         }
 
         public override void OnHealthIssue(HealthCheck.HealthCheck message)
         {
-            _emailService.SendEmail(Settings, HEALTH_ISSUE_TITLE_BRANDED, message.Message);
+            SendEmail(Settings, HEALTH_ISSUE_TITLE_BRANDED, message.Message);
         }
 
         public override ValidationResult Test()
         {
             var failures = new List<ValidationFailure>();
 
-            failures.AddIfNotNull(_emailService.Test(Settings));
+            failures.AddIfNotNull(Test(Settings));
 
             return new ValidationResult(failures);
         }
+
+        private void SendEmail(EmailSettings settings, string subject, string body, bool htmlBody = false)
+        {
+            var email = new MimeMessage();
+
+            email.From.Add(ParseAddress("From", settings.From));
+            email.To.AddRange(settings.To.Select(x => ParseAddress("To", x)));
+            email.Cc.AddRange(settings.Cc.Select(x => ParseAddress("CC", x)));
+            email.Bcc.AddRange(settings.Bcc.Select(x => ParseAddress("BCC", x)));
+
+            email.Subject = subject;
+            email.Body = new TextPart(htmlBody ? "html" : "plain")
+            {
+                Text = body
+            };
+
+            _logger.Debug("Sending email Subject: {0}", subject);
+
+            try
+            {
+                Send(email, settings);
+                _logger.Debug("Email sent. Subject: {0}", subject);
+
+            }
+            catch (Exception ex)
+            {
+                _logger.Error("Error sending email. Subject: {0}", email.Subject);
+                _logger.Debug(ex, ex.Message);
+                throw;
+            }
+
+            _logger.Debug("Finished sending email. Subject: {0}", subject);
+        }
+
+        private void Send(MimeMessage email, EmailSettings settings)
+        {
+            using (var client = new SmtpClient())
+            {
+                var serverOption = SecureSocketOptions.Auto;
+
+                if (settings.RequireEncryption)
+                {
+                    if (settings.Port == 465)
+                    {
+                        serverOption = SecureSocketOptions.SslOnConnect;
+                    }
+                    else
+                    {
+                        serverOption = SecureSocketOptions.StartTls;
+                    }
+                }
+
+                _logger.Debug("Connecting to mail server");
+
+                client.Connect(settings.Server, settings.Port, serverOption);
+
+                if (!string.IsNullOrWhiteSpace(settings.Username))
+                {
+                    _logger.Debug("Authenticating to mail server");
+
+                    client.Authenticate(settings.Username, settings.Password);
+                }
+
+                _logger.Debug("Sending to mail server");
+
+
+                client.Send(email);
+
+                _logger.Debug("Sent to mail server, disconnecting");
+
+                client.Disconnect(true);
+
+                _logger.Debug("Disconnecting from mail server");
+            }
+        }
+
+        public ValidationFailure Test(EmailSettings settings)
+        {
+            const string body = "Success! You have properly configured your email notification settings";
+
+            try
+            {
+                SendEmail(settings, "Sonarr - Test Notification", body);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Unable to send test email");
+                return new ValidationFailure("Server", "Unable to send test email");
+            }
+
+            return null;
+        }
+
+        private MailboxAddress ParseAddress(string type, string address)
+        {
+            try
+            {
+                return MailboxAddress.Parse(address);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "{0} email address '{1}' invalid", type, address);
+                throw;
+            }
+        }
     }
 }

src/NzbDrone.Core/Notifications/Email/EmailService.cs

@@ -1,116 +0,0 @@
-using System;
-using System.Linq;
-using FluentValidation.Results;
-using MailKit.Net.Smtp;
-using MailKit.Security;
-using MimeKit;
-using NLog;
-
-namespace NzbDrone.Core.Notifications.Email
-{
-    public interface IEmailService
-    {
-        void SendEmail(EmailSettings settings, string subject, string body, bool htmlBody = false);
-        ValidationFailure Test(EmailSettings settings);
-    }
-
-    public class EmailService : IEmailService
-    {
-        private readonly Logger _logger;
-
-        public EmailService(Logger logger)
-        {
-            _logger = logger;
-        }
-
-        public void SendEmail(EmailSettings settings, string subject, string body, bool htmlBody = false)
-        {
-            var email = new MimeMessage();
-            email.From.Add(ParseAddress("From", settings.From));
-            email.To.AddRange(settings.To.Select(x => ParseAddress("To", x)));
-            email.Cc.AddRange(settings.Cc.Select(x => ParseAddress("CC", x)));
-            email.Bcc.AddRange(settings.Bcc.Select(x => ParseAddress("BCC", x)));
-           
-            email.Subject = subject;
-            email.Body = new TextPart(htmlBody ? "html" : "plain")
-            {
-                Text = body
-            };
-
-            _logger.Debug("Sending email '{0}'", subject);
-
-            try
-            {
-                Send(email, settings);
-            }
-            catch(Exception ex)
-            {
-                _logger.Error("Error sending email. Subject: {0}", email.Subject);
-                _logger.Debug(ex, ex.Message);
-                throw;
-            }
-
-            _logger.Debug("Finished sending email '{0}'", subject);
-        }
-
-        private void Send(MimeMessage email, EmailSettings settings)
-        {
-            using (var client = new SmtpClient())
-            {
-                var serverOption = SecureSocketOptions.Auto;
-
-                if (settings.RequireEncryption)
-                {
-                    if (settings.Port == 465)
-                    {
-                        serverOption = SecureSocketOptions.SslOnConnect;
-                    }
-                    else
-                    {
-                        serverOption = SecureSocketOptions.StartTls;
-                    }
-                }
-
-                client.Connect(settings.Server, settings.Port, serverOption);
-
-                if (!string.IsNullOrWhiteSpace(settings.Username))
-                {
-                    client.Authenticate(settings.Username, settings.Password);
-                }
-
-                client.Send(email);
-                client.Disconnect(true);
-            }
-        }
-
-        public ValidationFailure Test(EmailSettings settings)
-        {
-            const string body = "Success! You have properly configured your email notification settings";
-
-            try
-            {
-                SendEmail(settings, "Sonarr - Test Notification", body);
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "Unable to send test email");
-                return new ValidationFailure("Server", "Unable to send test email");
-            }
-
-            return null;
-        }
-
-        private MailboxAddress ParseAddress(string type, string address)
-        {
-            try
-            {
-                return MailboxAddress.Parse(address);
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "{0} email address '{1}' invalid", type, address);
-                throw;
-            }
-        }
-    }
-}