diff --git a/src/ServiceControl/Notifications/Email/CustomChecksMailNotification.cs b/src/ServiceControl/Notifications/Email/CustomChecksMailNotification.cs index bbdaff35db..cb4d5351ed 100644 --- a/src/ServiceControl/Notifications/Email/CustomChecksMailNotification.cs +++ b/src/ServiceControl/Notifications/Email/CustomChecksMailNotification.cs @@ -25,7 +25,6 @@ class CustomChecksMailNotification : IDomainHandler, IDomainH "ServiceControl database", "ServiceControl Remotes", "Error Message Ingestion Process", - "Audit Message Ingestion", "Error Message Ingestion" }; diff --git a/src/ServiceControl/Notifications/Email/SendEmailNotificationHandler.cs b/src/ServiceControl/Notifications/Email/SendEmailNotificationHandler.cs index 26f4ac0036..866beb314c 100644 --- a/src/ServiceControl/Notifications/Email/SendEmailNotificationHandler.cs +++ b/src/ServiceControl/Notifications/Email/SendEmailNotificationHandler.cs @@ -32,9 +32,11 @@ public async Task Handle(SendEmailNotification message, IMessageHandlerContext c notifications = await manager.LoadSettings(cacheTimeout); } + logger.LogInformation("Processing email notification. Subject: {Subject}, Body: {Body}", message.Subject, message.Body); + if (notifications == null || !notifications.Email.Enabled) { - logger.LogInformation("Skipping email sending. Notifications turned-off"); + logger.LogDebug("Skipping email sending. Notifications turned-off"); return; } @@ -57,8 +59,7 @@ public async Task Handle(SendEmailNotification message, IMessageHandlerContext c if (context.MessageId == throttlingState.RetriedMessageId) { - message.Body += - "\n\nWARNING: Your SMTP server was temporarily unavailable. Make sure to check ServicePulse for a full list of health check notifications."; + message.Body += "\n\nWARNING: Your SMTP server was temporarily unavailable. Make sure to check ServicePulse for a full list of health check notifications."; } await emailSender.Send(notifications.Email, message.Subject, message.Body, emailDropFolder);