Author: jflesch
Date: 2007-05-01 14:39:55 +0000 (Tue, 01 May 2007)
New Revision: 13079
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java
Log:
Add time to the date in transferLogs plugin (purge your current logs) + fix
various problems
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-05-01 14:20:53 UTC
(rev 13078)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java 2007-05-01 14:39:55 UTC
(rev 13079)
@@ -201,7 +201,7 @@
progress = 0;
finished = false;
successful = false;
- running = false;
+ running = true;
sha = null;
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2007-05-01 14:20:53 UTC
(rev 13078)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueManager.java 2007-05-01 14:39:55 UTC
(rev 13079)
@@ -203,6 +203,9 @@
}
}
+ if(callStart)
+ query.start(this);
+
synchronized(runningQueries) {
runningQueries.add(query);
}
@@ -220,9 +223,6 @@
setChanged();
this.notifyObservers(query);
- if(callStart)
- query.start(this);
-
Logger.debug(this, "Adding done");
return true;
Modified: trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java 2007-05-01 14:20:53 UTC
(rev 13078)
+++ trunk/apps/Thaw/src/thaw/plugins/TransferLogs.java 2007-05-01 14:39:55 UTC
(rev 13079)
@@ -113,8 +113,6 @@
tab.add(new JScrollPane(table), BorderLayout.CENTER);
tab.add(southPanel, BorderLayout.SOUTH);
- core.getQueueManager().addObserver(this);
-
setAsObserverEverywhere(true);
core.getMainWindow().addTab(I18n.getMessage("thaw.plugin.transferLogs.transferLogsShort"),
@@ -152,7 +150,7 @@
*/
sendQuery("CREATE CACHED TABLE transferEvents ("
+ "id INTEGER IDENTITY NOT NULL,"
- + "date DATE NOT NULL,"
+ + "date TIMESTAMP NOT NULL,"
+ "msg VARCHAR(500) NOT NULL,"
+ "key VARCHAR(500) NULL,"
+ "isDup BOOLEAN NOT NULL, "
@@ -167,7 +165,9 @@
*/
protected boolean sendQuery(final String query) {
try {
- db.executeQuery(query);
+ synchronized(db.dbLock) {
+ db.executeQuery(query);
+ }
return true;
} catch(final SQLException e) {
Logger.notice(this, "While (re)creating sql tables:
"+e.toString());
@@ -184,7 +184,7 @@
if (really)
core.getQueueManager().addObserver(this);
else
- core.getQueueManager().addObserver(this);
+ core.getQueueManager().deleteObserver(this);
Vector runningQueue = core.getQueueManager().getRunningQueue();
@@ -194,11 +194,16 @@
it.hasNext();) {
FCPTransferQuery query =
(FCPTransferQuery)it.next();
- if (query.isFinished() &&
!isDup(query.getFileKey()))
- notifyEnd(query);
+ if (really) {
+ if (query.isFinished() &&
!isDup(query.getFileKey()))
+ notifyEnd(query);
- if (query instanceof Observable)
- ((Observable)query).addObserver(this);
+ if (query instanceof Observable)
+
((Observable)query).addObserver(this);
+ } else {
+ if (query instanceof Observable)
+
((Observable)query).deleteObserver(this);
+ }
}
}
}
@@ -242,7 +247,7 @@
key = null;
}
- java.sql.Date date = new java.sql.Date((new
java.util.Date()).getTime());
+ java.sql.Timestamp date = new java.sql.Timestamp((new
java.util.Date()).getTime());
boolean isDup;
@@ -260,7 +265,7 @@
"(date, msg, key, isDup, isSuccess) "+
"
VALUES "+
"(?,
?, ?, ?, FALSE)");
- st.setDate(1, date);
+ st.setTimestamp(1, date);
st.setString(2, str);
st.setString(3, key);
st.setBoolean(4, isDup);
@@ -309,7 +314,7 @@
else
isDup = false;
- java.sql.Date date = new java.sql.Date((new
java.util.Date()).getTime());
+ java.sql.Timestamp date = new java.sql.Timestamp((new
java.util.Date()).getTime());
try {
@@ -321,7 +326,7 @@
"(date, msg, key, isDup, isSuccess) "+
"
VALUES "+
"(?,
?, ?, ?, ?)");
- st.setDate(1, date);
+ st.setTimestamp(1, date);
st.setString(2, str);
st.setString(3, key);
st.setBoolean(4, isDup);
@@ -348,7 +353,8 @@
FCPTransferQuery query = (FCPTransferQuery)param;
- if(core.getQueueManager().isInTheQueues(query)) { //
then it's an addition
+ if(core.getQueueManager().isInTheQueues(query)
+ && query.isRunning()) { // then it's an addition
if (query instanceof Observable)
((Observable)query).addObserver(this);
if
(core.getQueueManager().isQueueCompletlyLoaded())
@@ -370,19 +376,19 @@
private class Event {
- private java.sql.Date date;
+ private java.sql.Timestamp date;
private String msg;
private String key;
private boolean isDup;
- public Event(java.sql.Date date, String message, String key,
boolean isDup) {
+ public Event(java.sql.Timestamp date, String message, String
key, boolean isDup) {
this.date = date;
this.msg = message;
this.key = key;
this.isDup = isDup;
}
- public java.sql.Date getDate() {
+ public java.sql.Timestamp getDate() {
return date;
}
@@ -418,7 +424,7 @@
public EventListModel() {
super();
- dateFormat = DateFormat.getDateInstance();
+ dateFormat = DateFormat.getDateTimeInstance();
}
public void reloadList() {
@@ -436,7 +442,7 @@
events = new Vector();
while(set.next()) {
- events.add(new
Event(set.getDate("date"),
+ events.add(new
Event(set.getTimestamp("date"),
set.getString("msg"),
set.getString("key"),
set.getBoolean("isDup")));
@@ -513,17 +519,9 @@
public void actionPerformed(ActionEvent e) {
if (e.getSource() == purgeLogs) {
- try {
- synchronized(db.dbLock) {
- PreparedStatement st;
+ sendQuery("DROP TABLE transferEvents");
+ createTables();
- st =
db.getConnection().prepareStatement("DELETE FROM transferEvents");
- st.execute();
- }
- } catch(SQLException exc) {
- Logger.error(this, "Unable to purge the logs
because: "+exc.toString());
- }
-
model.reloadList();
return;
