v6.2 broadcast circuit breaker msg

pierre-b · pierre-b · commit abc1ba9fa9ae · 2025-09-08T09:29:50.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.2] - 2025-09-08
+
+- Fix circuit breaker error message in broadcast pause reason
+- Simplify broadcast circuit breaker notification email
+
 ## [6.1] - 2025-09-07
 
 - hide menu items in console when user doesn't have access to the resource
diff --git a/config/config.go b/config/config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-const VERSION = "6.1"
+const VERSION = "6.2"
 
 type Config struct {
 	Server          ServerConfig
diff --git a/internal/service/broadcast/orchestrator.go b/internal/service/broadcast/orchestrator.go
@@ -395,6 +395,18 @@ func (o *BroadcastOrchestrator) Process(ctx context.Context, task *domain.Task,
 	// Defer function to mark broadcast as failed if we're returning an error on the last retry
 	defer func() {
 		if err != nil && isLastRetry && broadcastID != "" {
+			// Check if the error is a circuit breaker error - don't mark as failed in that case
+			if broadcastErr, ok := err.(*BroadcastError); ok && broadcastErr.Code == ErrCodeCircuitOpen {
+				o.logger.WithFields(map[string]interface{}{
+					"task_id":      task.ID,
+					"broadcast_id": broadcastID,
+					"retry_count":  task.RetryCount,
+					"max_retries":  task.MaxRetries,
+					"error":        err.Error(),
+				}).Info("Task failed due to circuit breaker - broadcast already paused, not marking as failed")
+				return
+			}
+
 			o.logger.WithFields(map[string]interface{}{
 				"task_id":      task.ID,
 				"broadcast_id": broadcastID,
diff --git a/pkg/mailer/mailer.go b/pkg/mailer/mailer.go
@@ -211,28 +211,13 @@ func (m *SMTPMailer) SendCircuitBreakerAlert(email, workspaceName, broadcastName
 		<body>
 			<h1 style="color: #d32f2f;">🚨 Broadcast Automatically Paused</h1>
 			<p>Hello,</p>
-			<p>Your broadcast <strong>"%s"</strong> in workspace <strong>%s</strong> has been automatically paused due to sending limits being reached.</p>
-			
+			<p>Your broadcast <strong>"%s"</strong> in workspace <strong>%s</strong> has been automatically paused.</p>
+
 			<div style="background-color: #fff3cd; border: 1px solid #ffeaa7; padding: 15px; border-radius: 5px; margin: 20px 0;">
 				<h3 style="color: #856404; margin-top: 0;">Reason:</h3>
 				<p style="margin-bottom: 0; color: #856404;"><strong>%s</strong></p>
 			</div>
-			
-			<h3>What happened?</h3>
-			<p>Your email service provider has indicated that you've reached your daily sending limits. To protect your sender reputation and prevent further issues, we've automatically paused your broadcast.</p>
-			
-			<h3>What should you do?</h3>
-			<ul>
-				<li>Wait for your daily sending limits to reset (usually at midnight in your provider's timezone)</li>
-				<li>Check your email provider's dashboard for more details about your sending limits</li>
-				<li>Resume the broadcast once your limits have been reset</li>
-				<li>Consider upgrading your email provider plan if you frequently hit these limits</li>
-			</ul>
-			
-			<p>You can resume the broadcast from your Notifuse dashboard once the sending limits have been reset.</p>
-			
-			<p>If you have any questions, please contact our support team.</p>
-			
+
 			<p>Best regards,<br>The Notifuse Team</p>
 		</body>
 	</html>`, broadcastName, workspaceName, reason)
@@ -243,23 +228,10 @@ func (m *SMTPMailer) SendCircuitBreakerAlert(email, workspaceName, broadcastName
 
 Hello,
 
-Your broadcast "%s" in workspace %s has been automatically paused due to sending limits being reached.
+Your broadcast "%s" in workspace %s has been automatically paused.
 
 REASON: %s
 
-What happened?
-Your email service provider has indicated that you've reached your daily sending limits. To protect your sender reputation and prevent further issues, we've automatically paused your broadcast.
-
-What should you do?
-- Wait for your daily sending limits to reset (usually at midnight in your provider's timezone)
-- Check your email provider's dashboard for more details about your sending limits  
-- Resume the broadcast once your limits have been reset
-- Consider upgrading your email provider plan if you frequently hit these limits
-
-You can resume the broadcast from your Notifuse dashboard once the sending limits have been reset.
-
-If you have any questions, please contact our support team.
-
 Best regards,
 The Notifuse Team`, broadcastName, workspaceName, reason)
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/spf13/viper"`
`11`	`11`	`)`
`12`	`12`
`13`		`-const VERSION = "6.1"`
	`13`	`+const VERSION = "6.2"`
`14`	`14`
`15`	`15`	`type Config struct {`
`16`	`16`	`Server ServerConfig`