You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/02/06 19:54:11 UTC
svn commit: r1241109 - in
/incubator/airavata/trunk/modules/ws-messenger/messagebox/src:
main/java/org/apache/airavata/wsmg/msgbox/
main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/
test/resources/conf/
Author: lahiru
Date: Mon Feb 6 18:54:10 2012
New Revision: 1241109
URL: http://svn.apache.org/viewvc?rev=1241109&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-283.
Modified:
incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java
incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java
incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBox.properties
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java?rev=1241109&r1=1241108&r2=1241109&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceSkeleton.java Mon Feb 6 18:54:10 2012
@@ -47,7 +47,7 @@ public class MsgBoxServiceSkeleton imple
private static final Logger logger = LoggerFactory.getLogger(MsgBoxServiceSkeleton.class);
private static final String TRUE = Boolean.toString(true);
private static final String FALSE = Boolean.toString(false);
- private static final long SLEEP_TIME = 60 * 60 * 1000l; // 1 hour;
+ private static final long SLEEP_TIME = 5 * 60 * 1000l; // 1 hour;
private static OMFactory factory = OMAbstractFactory.getOMFactory();
private MsgBoxStorage storage;
private Thread deletingThread;
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java?rev=1241109&r1=1241108&r2=1241109&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/Storage/dbpool/MessageBoxDB.java Mon Feb 6 18:54:10 2012
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
public class MessageBoxDB {
private static final String MSGBOXES_TABLENAME = "msgBoxes";
- private static final String MSGBOX_TABLENAME = "msgbox";
+ private static final String MSGBOX_TABLENAME = "msgbox";
private static final Logger logger = LoggerFactory.getLogger(MessageBoxDB.class);
@@ -73,7 +73,7 @@ public class MessageBoxDB {
public static final String SQL_DELETE_MSGBOX_STATEMENT = "DELETE FROM " + MSGBOX_TABLENAME + " WHERE msgboxid = ?";
public static final String SQL_DELETE_ANCIENT_STATEMENT = "DELETE FROM " + MSGBOX_TABLENAME
- + " WHERE {fn TIMESTAMPDIFF(SQL_TSI_FRAC_SECOND, CURRENT_TIMESTAMP, time) } > ?";
+ + " WHERE {fn TIMESTAMPDIFF(SQL_TSI_FRAC_SECOND, time, CURRENT_TIMESTAMP) } > ?";
private JdbcStorage db;
@@ -151,7 +151,7 @@ public class MessageBoxDB {
throw sql;
}
} else {
- throw new IOException("Currently a messagebox is not available with given message box id :" + msgBoxID);
+ throw new IOException("Currently a messagebox is not available with given message box id :" + msgBoxID + message.toStringWithConsume());
}
}
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBox.properties
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBox.properties?rev=1241109&r1=1241108&r2=1241109&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBox.properties (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebox/src/test/resources/conf/msgBox.properties Mon Feb 6 18:54:10 2012
@@ -24,6 +24,6 @@
msgBox.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver
msgBox.jdbc.url=jdbc:derby:wsmg;create=true;user=airavata;password=airavata
msgBox.usedatabase=false
-messagePreservationDays=2
+messagePreservationDays=0
messagePreservationHours=0
-messagePreservationMinutes=0
+messagePreservationMinutes=5