User: lqd
Date: 02/03/25 22:40:41
Modified: src/main/org/jboss/mq/pm/file Tag: Branch_2_4
MessageLog.java PersistenceManager.java
Log:
change logging from System.out to log4j
Revision Changes Path
No revision
No revision
1.2.2.3 +12 -5 jbossmq/src/main/org/jboss/mq/pm/file/MessageLog.java
Index: MessageLog.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/file/MessageLog.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- MessageLog.java 13 Dec 2001 15:58:18 -0000 1.2.2.2
+++ MessageLog.java 26 Mar 2002 06:40:41 -0000 1.2.2.3
@@ -20,16 +20,20 @@
import org.jboss.mq.SpyMessage;
import org.jboss.mq.SpyJMSException;
+import org.jboss.logging.Logger;
+
/**
* This is used to keep SpyMessages on the disk and is used reconstruct the
* queue in case of provider failure.
*
* @created August 16, 2001
* @author: Paul Kendall ([EMAIL PROTECTED])
- * @version $Revision: 1.2.2.2 $
+ * @version $Revision: 1.2.2.3 $
*/
public class MessageLog {
+ private static Logger log = Logger.getLogger( MessageLog.class );
+
/////////////////////////////////////////////////////////////////////
// Attributes
/////////////////////////////////////////////////////////////////////
@@ -150,10 +154,10 @@
Thread.yield();
if ( file.exists() ) {
if ( !file.delete() ) {
- System.out.println( "Failed to delete file: " +
file.getAbsolutePath() );
+ log.warn( "Failed to delete file: " + file.getAbsolutePath() );
}
} else {
- System.out.println( "File was deleted, but delete() failed for: " +
file.getAbsolutePath() );
+ log.warn( "File was deleted, but delete() failed for: " +
file.getAbsolutePath() );
}
}
}
@@ -166,10 +170,10 @@
Thread.yield();
if ( from.exists() ) {
if ( !from.renameTo( to ) ) {
- System.out.println( "Rename of file " + from.getAbsolutePath() + "
to " + to.getAbsolutePath() + " failed." );
+ log.warn( "Rename of file " + from.getAbsolutePath() + " to " +
to.getAbsolutePath() + " failed." );
}
} else {
- System.out.println( "Rename of file " + from.getAbsolutePath() + " to "
+ to.getAbsolutePath() + " failed but from no longer exists?" );
+ log.warn( "Rename of file " + from.getAbsolutePath() + " to " +
to.getAbsolutePath() + " failed but from no longer exists?" );
}
}
}
@@ -203,3 +207,6 @@
throw newE;
}
}
+/*
+vim:ts=3:et:sw=3
+*/
1.2.2.2 +13 -3 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.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- PersistenceManager.java 23 Aug 2001 03:57:11 -0000 1.2.2.1
+++ PersistenceManager.java 26 Mar 2002 06:40:41 -0000 1.2.2.2
@@ -26,15 +26,20 @@
import org.jboss.util.ServiceMBeanSupport;
+import org.jboss.logging.Logger;
+
/**
* This class manages all persistence related services for file based
* persistence.
*
* @author Paul Kendall ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.2.2.1 $
+ * @version $Revision: 1.2.2.2 $
*/
-public class PersistenceManager extends org.jboss.util.ServiceMBeanSupport
implements PersistenceManagerMBean, org.jboss.mq.pm.PersistenceManager {
+public class PersistenceManager
+ extends org.jboss.util.ServiceMBeanSupport
+ implements PersistenceManagerMBean, org.jboss.mq.pm.PersistenceManager
+{
protected java.util.ArrayList txPool = new java.util.ArrayList();
protected long tidcounter = Long.MIN_VALUE;
@@ -52,6 +57,8 @@
protected final static int MAX_POOL_SIZE = 50;
+ private static Logger log = Logger.getLogger( PersistenceManager.class );
+
/**
* PersistenceManager constructor.
*
@@ -107,7 +114,7 @@
txs.add( tx );
}
} catch ( NumberFormatException e ) {
- System.out.println( "Ignoring invalid transaction record file " +
transactFiles[i].getAbsolutePath() );
+ log.warn( "Ignoring invalid transaction record file " +
transactFiles[i].getAbsolutePath() );
transactFiles[i] = null;
} catch ( IOException e ) {
JMSException jmse = new SpyJMSException( "IO Error when restoring." );
@@ -504,3 +511,6 @@
}
}
}
+/*
+vim:ts=3:et:sw=3
+*/
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
