User: ejort
Date: 02/01/04 22:38:13
Modified: src/main/org/jboss/mq/pm/file CacheStore.java
PersistenceManager.java
Log:
Guarded debug logging
Revision Changes Path
1.3 +7 -4 jbossmq/src/main/org/jboss/mq/pm/file/CacheStore.java
Index: CacheStore.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/file/CacheStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CacheStore.java 2002/01/03 04:00:53 1.2
+++ CacheStore.java 2002/01/05 06:38:13 1.3
@@ -25,7 +25,7 @@
* This class manages the persistence needs of the MessageCache
*
* @author Hiram Chirino
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class CacheStore extends ServiceMBeanSupport implements
org.jboss.mq.pm.CacheStore, CacheStoreMBean {
String dataDirectory;
@@ -95,10 +95,12 @@
* This gets called to start the service.
*/
protected void startService() throws Exception {
+ boolean debug = log.isDebugEnabled();
log.warn("using jboss.system.home property");
File jbossHome = new File(System.getProperty("jboss.system.home"));
dataFile = new File(jbossHome, dataDirectory);
- log.debug("Data directory set to: " + dataFile.getCanonicalPath());
+ if (debug)
+ log.debug("Data directory set to: " + dataFile.getCanonicalPath());
dataFile.mkdirs();
if (!dataFile.isDirectory())
@@ -106,7 +108,8 @@
// Clean out the directory of any previous files.
File files[] = dataFile.listFiles();
- log.debug("Removing " + files.length + " file(s) from: " +
dataFile.getCanonicalPath());
+ if (debug)
+ log.debug("Removing " + files.length + " file(s) from: " +
dataFile.getCanonicalPath());
for (int i = 0; i < files.length; i++) {
files[i].delete();
}
@@ -120,4 +123,4 @@
return this;
}
-}
\ No newline at end of file
+}
1.14 +25 -27 jbossmq/src/main/org/jboss/mq/pm/file/PersistenceManager.java
Index: PersistenceManager.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/file/PersistenceManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PersistenceManager.java 2002/01/03 04:00:53 1.13
+++ PersistenceManager.java 2002/01/05 06:38:13 1.14
@@ -6,14 +6,6 @@
*/
package org.jboss.mq.pm.file;
-
-
-
-
-
-
-
-
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
@@ -45,7 +37,7 @@
* persistence.
*
* @author Paul Kendall ([EMAIL PROTECTED])
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public class PersistenceManager extends ServiceMBeanSupport implements
PersistenceManagerMBean, org.jboss.mq.pm.PersistenceManager
{
@@ -172,6 +164,8 @@
*/
private void restoreTransactions() throws javax.jms.JMSException
{
+ boolean debug = log.isDebugEnabled();
+
TreeSet txs = new TreeSet();
File[] transactFiles = dataDirFile.listFiles();
int queueNameOffset = dataDirFile.toString().length()+1;
@@ -180,12 +174,12 @@
for (int i = 0; i < transactFiles.length; i++)
{
// Set up a messageLog for each queue data directory.
- if( transactFiles[i].isDirectory() )
+ if( transactFiles[i].isDirectory() )
{
String dirName = transactFiles[i].toString();
String key = dirName.substring(queueNameOffset);
- MessageLog log = new MessageLog(messageCache, transactFiles[i]);
- LogInfo info = new LogInfo(log, null);
+ MessageLog msgLog = new MessageLog(messageCache, transactFiles[i]);
+ LogInfo info = new LogInfo(msgLog, null);
synchronized (messageLogs)
{
messageLogs.put(key, info);
@@ -193,7 +187,7 @@
transactFiles[i] = null;
continue;
}
-
+
try
{
Long tx = new Long(Long.parseLong(transactFiles[i].getName()));
@@ -227,11 +221,12 @@
clone = (HashMap)messageLogs.clone();
}
- for (Iterator i = clone.keySet().iterator(); i.hasNext();)
+ for (Iterator i = clone.keySet().iterator(); i.hasNext();)
{
Object key = i.next();
LogInfo logInfo = (LogInfo)clone.get(key);
- log.debug("Recovered messages destined for: "+key);
+ if (debug)
+ log.debug("Recovered messages destined for: "+key);
unrestoredMessages.put(key, logInfo.log.restore(txs));
}
@@ -292,37 +287,40 @@
public void restoreQueue(JMSDestination jmsDest, SpyDestination dest)
throws JMSException
{
- log.debug("restoring destination: "+dest);
+ boolean debug = log.isDebugEnabled();
+ if (debug)
+ log.debug("restoring destination: "+dest);
//remember this queue
- String queueName = dest.toString();
+ String queueName = dest.toString();
LogInfo info = (LogInfo)messageLogs.get(queueName);
- if (info == null)
+ if (info == null)
{
//must be new, set up directory etc.
File logDir = new File(dataDirFile, queueName);
- MessageLog log = new MessageLog(messageCache, logDir);
- info = new LogInfo(log, dest);
+ MessageLog msgLog = new MessageLog(messageCache, logDir);
+ info = new LogInfo(msgLog, dest);
synchronized (messageLogs)
{
messageLogs.put(queueName, info);
}
-
+
} // end of if ()
- else
+ else
{
info.destination = dest;
} // end of else
-
+
//restore the messages from old logs (previously read into unrestoredMessages)
Map messages = (Map)unrestoredMessages.remove(queueName);
- if (messages != null)
- {
- log.debug("Restore message count: "+messages.size());
+ if (messages != null)
+ {
+ if (debug)
+ log.debug("Restore message count: "+messages.size());
synchronized (jmsDest)
{
Iterator m = messages.values().iterator();
- while (m.hasNext())
+ while (m.hasNext())
{
MessageReference message = (MessageReference)m.next();
if (dest instanceof org.jboss.mq.SpyTopic)
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
