Commit @2799c86c336e29fbebb4ab5f5a0afc24c0434065

Yi EungJun 2015-04-01

mail: Fix endless notification email

Yobi was sending a notification email endlessly if it failed to delete
the email from the sending queue. It may happen if the database is
corrupted.

Do not send the notification email if an exception was thrown when
deleting it from the queue(notification_email table).

@2799c86c336e29fbebb4ab5f5a0afc24c0434065

7b24f91

2799c86

app/models/NotificationMail.java

--- app/models/NotificationMail.java

+++ app/models/NotificationMail.java


                                     .orderBy("notificationEvent.created ASC").findList();
 
                     for (NotificationMail mail: mails) {
-                        if (mail.notificationEvent.resourceExists()) {
-                            sendNotification(mail.notificationEvent);
-                        }
+                        NotificationEvent event = mail.notificationEvent;
                         mail.delete();
+                        if (event.resourceExists()) {
+                            sendNotification(event);
+                        }
                     }
                 }
             },

Add a comment

Open 0
Closed 0

List

...	...	@@ -139,10 +139,11 @@
139	139	.orderBy("notificationEvent.created ASC").findList();
140	140
141	141	for (NotificationMail mail: mails) {
142		- if (mail.notificationEvent.resourceExists()) {
143		- sendNotification(mail.notificationEvent);
144		- }
	142	+ NotificationEvent event = mail.notificationEvent;
145	143	mail.delete();
	144	+ if (event.resourceExists()) {
	145	+ sendNotification(event);
	146	+ }
146	147	}
147	148	}
148	149	},

Delete comment