Skip to content

Log email notification subject and body for all SendEmailNotificationHandler executions #5139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bording merged 3 commits into from
Oct 31, 2025
Merged

Log email notification subject and body for all SendEmailNotificationHandler executions #5139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b299b9
remove duplicate custom check - Audit Message Ingestion
soujay Oct 16, 2025
34cb9e4
add email notification subject and body to log
soujay Oct 16, 2025
e6d2a63
apply code review suggestions
soujay Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/ServiceControl/Notifications/Email/CustomChecksMailNotification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class CustomChecksMailNotification : IDomainHandler<CustomCheckFailed>, IDomainH
"ServiceControl database",
"ServiceControl Remotes",
"Error Message Ingestion Process",
"Audit Message Ingestion",
"Error Message Ingestion"
};

Expand Down
7 changes: 4 additions & 3 deletions src/ServiceControl/Notifications/Email/SendEmailNotificationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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);
Expand Down