Author: solomax
Date: Sun Mar 17 09:56:20 2013
New Revision: 1457407
URL: http://svn.apache.org/r1457407
Log:
Release: table for emails is renamed;
"last_error" field is added;
wrong line ending in properties file is fixed;
Modified:
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/MailMessage.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java
Modified: openmeetings/trunk/singlewebapp/build.properties
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1457407&r1=1457406&r2=1457407&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Sun Mar 17 09:56:20 2013
@@ -15,6 +15,6 @@ ivy.install.version=2.3.0
red5.server.revision=4393
red5.client.revision=4393
laszlo.proxied=solo
-wicket.mode=DEPLOYMENT
+wicket.mode=DEPLOYMENT
backup.file.list=backup_v_1_4_rc1_r3326.zip,backup_v_1_5_rc1_r3393.zip,backup_v_1_6_2_r3675.zip,backup_v_1_7_0_r3822.zip,backup_v_1_8_8_r4555.zip,backup_v_1_9_1_r4707.zip,backup_v_2_0_0_r1361497.zip
db=derby
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/MailMessage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/MailMessage.java?rev=1457407&r1=1457406&r2=1457407&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/MailMessage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/MailMessage.java
Sun Mar 17 09:56:20 2013
@@ -41,7 +41,7 @@ import org.apache.openmeetings.persisten
, query = "SELECT m FROM MailMessage m WHERE m.status = :status
ORDER BY m.updated, m.inserted")
, @NamedQuery(name = "countMailMessages", query = "SELECT COUNT(m) FROM
MailMessage m WHERE m.status = :status")
})
-@Table(name = "email")
+@Table(name = "email_queue")
public class MailMessage implements IDataProviderEntity {
public enum Status {
NONE
@@ -83,9 +83,13 @@ public class MailMessage implements IDat
@Column(name = "updated")
private Calendar updated;
- @Column(name = "errorCount", nullable = false)
+ @Column(name = "error_count", nullable = false)
private int errorCount = 0;
+ @Lob
+ @Column(name = "last_error")
+ private String lastError;
+
public MailMessage(String recipients, String replyTo, String subject,
String body) {
this(recipients, replyTo, subject, body, null);
}
@@ -177,4 +181,12 @@ public class MailMessage implements IDat
public void setErrorCount(int errorCount) {
this.errorCount = errorCount;
}
+
+ public String getLastError() {
+ return lastError;
+ }
+
+ public void setLastError(String lastError) {
+ this.lastError = lastError;
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java?rev=1457407&r1=1457406&r2=1457407&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java
Sun Mar 17 09:56:20 2013
@@ -20,6 +20,8 @@ package org.apache.openmeetings.utils.ma
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -203,10 +205,16 @@ public class MailHandler {
// -- Send the message --
try {
Transport.send(getMimeMessage(m));
+ m.setLastError("");
m.setStatus(Status.DONE);
} catch (Exception e) {
log.error("Error while sending
message", e);
m.setErrorCount(m.getErrorCount() + 1);
+ StringWriter sw = new
StringWriter();
+ PrintWriter pw = new
PrintWriter(sw);
+ e.printStackTrace(pw);
+ pw.close();
+
m.setLastError(sw.getBuffer().toString());
m.setStatus(m.getErrorCount() <
MAXIMUM_ERROR_COUNT ? Status.NONE : Status.ERROR);
}
if (m.getId() != null) {
