[jboss-cvs] JBossAS SVN: r111516 - in projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core: connectionmanager and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 3 05:35:32 EDT 2011
Author: jeff.zhang
Date: 2011-06-03 05:35:32 -0400 (Fri, 03 Jun 2011)
New Revision: 111516
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerImpl.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerImpl.java
Log:
[JBJCA-592] connection manager and TransactionSynchronizer logging
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-03 03:08:11 UTC (rev 111515)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-03 09:35:32 UTC (rev 111516)
@@ -170,4 +170,76 @@
@LogMessage(level = ERROR)
@Message(id = 313, value = "There is something wrong with the pooling?")
public void somethingWrongWithPooling(@Cause Throwable t);
+
+
+ // CONNECTION MANAGER (400)
+
+ /**
+ * Error during tidy up connection
+ * @param cl The ConnectionListener name
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 401, value = "Error during tidy up connection: %s")
+ public void errorDuringTidyUpConnection(String cl, @Cause Throwable t);
+
+ /**
+ * resourceException in returning connection
+ * @param mc The ManagedConnection name
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 402, value = "resourceException in returning connection: %s")
+ public void resourceExceptionReturningConnection(String mc, @Cause Throwable t);
+
+ /**
+ * reconnecting a connection handle that still has a managedConnection
+ * @param mc The ManagedConnection name
+ * @param connection connection object
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 403, value = "reconnecting a connection handle that still has a managedConnection! %s %s")
+ public void reconnectingConnectionHandleHasManagedConnection(String mc, Object connection);
+
+ /**
+ * Unchecked throwable in managedConnectionDisconnected()
+ * @param cl The ConnectionListener name
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 404, value = "Unchecked throwable in managedConnectionDisconnected() cl= %s")
+ public void uncheckedThrowableInManagedConnectionDisconnected(String cl, @Cause Throwable t);
+
+
+ // TRANSACTION SYNCHRONIZER (500)
+
+ /**
+ * Thread is not the enlisting thread
+ * @param currentThread current thread
+ * @param enlistingThread enlisting thread
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 501, value = "thread %s is not the enlisting thread %s")
+ public void threadIsnotEnlistingThread(String currentThread, String enlistingThread, @Cause Throwable t);
+
+ /**
+ * Transaction error in before completion
+ * @param transaction transaction
+ * @param synch Synchronization
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 502, value = "Transaction %s error in before completion %s")
+ public void transactionErrorInBeforeCompletion(String transaction, String synch, @Cause Throwable t);
+
+ /**
+ * Transaction error in after completion
+ * @param transaction transaction
+ * @param synch Synchronization
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 503, value = "Transaction %s error in after completion %s")
+ public void transactionErrorInAfterCompletion(String transaction, String synch, @Cause Throwable t);
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java 2011-06-03 03:08:11 UTC (rev 111515)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java 2011-06-03 09:35:32 UTC (rev 111516)
@@ -24,6 +24,7 @@
import org.jboss.jca.common.JBossResourceException;
import org.jboss.jca.common.api.metadata.common.FlushStrategy;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.api.connectionmanager.ccm.CachedConnectionManager;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionState;
@@ -52,7 +53,6 @@
import javax.transaction.SystemException;
import javax.transaction.Transaction;
-import org.jboss.logging.Logger;
import org.jboss.security.SubjectFactory;
/**
@@ -64,10 +64,10 @@
public abstract class AbstractConnectionManager implements ConnectionManager
{
/** Log instance */
- private final Logger log;
+ private final CoreLogger log;
/** Log trace */
- private final boolean trace;
+ protected boolean trace;
/** The pool */
private Pool pool;
@@ -112,7 +112,7 @@
* Get the logger.
* @return The value
*/
- protected abstract Logger getLogger();
+ protected abstract CoreLogger getLogger();
/**
* Set the pool.
@@ -416,7 +416,7 @@
}
catch (Throwable t)
{
- log.warn("Error during tidy up connection" + cl, t);
+ log.errorDuringTidyUpConnection(cl.toString(), t);
kill = true;
}
@@ -435,7 +435,7 @@
}
else
{
- log.warn("resourceException returning connection: " + cl.getManagedConnection(), re);
+ log.resourceExceptionReturningConnection(cl.getManagedConnection().toString(), re);
}
}
}
@@ -480,7 +480,8 @@
}
catch (ResourceException re)
{
- log.trace("Get exception from managedConnectionDisconnected, maybe delist() have problem" + re);
+ if (trace)
+ log.trace("Get exception from managedConnectionDisconnected, maybe delist() have problem" + re);
returnManagedConnection(cl, true);
}
JBossResourceException.rethrowAsResourceException(
@@ -508,7 +509,8 @@
// nothing to do
if (unsharableResources.contains(jndiName))
{
- log.trace("disconnect for unshareable connection: nothing to do");
+ if (trace)
+ log.trace("disconnect for unshareable connection: nothing to do");
return;
}
@@ -539,7 +541,8 @@
// nothing to do
if (unsharableResources.contains(jndiName))
{
- log.trace("reconnect for unshareable connection: nothing to do");
+ if (trace)
+ log.trace("reconnect for unshareable connection: nothing to do");
return;
}
@@ -552,8 +555,9 @@
if (cr.getConnectionListener() != null)
{
//This might well be an error.
- log.warn("reconnecting a connection handle that still has a managedConnection! "
- + cr.getConnectionListener().getManagedConnection() + " " + cr.getConnection());
+ log.reconnectingConnectionHandleHasManagedConnection(
+ cr.getConnectionListener().getManagedConnection().toString(),
+ cr.getConnection());
}
ConnectionListener cl = criToCLMap.get(cr.getCri());
if (cl == null)
@@ -616,7 +620,7 @@
}
catch (Throwable t)
{
- log.warn("Unchecked throwable in managedConnectionDisconnected() cl=" + cl, t);
+ log.uncheckedThrowableInManagedConnectionDisconnected(cl.toString(), t);
}
}
@@ -697,7 +701,8 @@
}
}
- log.tracef("Subject: %s", subject);
+ if (trace)
+ log.tracef("Subject: %s", subject);
return subject;
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerImpl.java 2011-06-03 03:08:11 UTC (rev 111515)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerImpl.java 2011-06-03 09:35:32 UTC (rev 111516)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.notx;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.connectionmanager.AbstractConnectionManager;
import org.jboss.jca.core.connectionmanager.ConnectionRecord;
import org.jboss.jca.core.connectionmanager.NoTxConnectionManager;
@@ -46,7 +47,7 @@
public class NoTxConnectionManagerImpl extends AbstractConnectionManager implements NoTxConnectionManager
{
/** The logger */
- private static Logger log = Logger.getLogger(NoTxConnectionManager.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, NoTxConnectionManager.class.getName());
/** Serial version uid */
private static final long serialVersionUID = 1L;
@@ -62,7 +63,7 @@
* Get the logger.
* @return The value
*/
- protected Logger getLogger()
+ protected CoreLogger getLogger()
{
return log;
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java 2011-06-03 03:08:11 UTC (rev 111515)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/transaction/TransactionSynchronizer.java 2011-06-03 09:35:32 UTC (rev 111516)
@@ -21,6 +21,8 @@
*/
package org.jboss.jca.core.connectionmanager.transaction;
+import org.jboss.jca.core.CoreLogger;
+
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@@ -50,7 +52,7 @@
public class TransactionSynchronizer implements Synchronization
{
/** The logger */
- private static Logger log = Logger.getLogger(TransactionSynchronizer.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, TransactionSynchronizer.class.getName());
/** The transaction synchronizations */
private static ConcurrentMap<Transaction, TransactionSynchronizer> txSynchs =
@@ -167,8 +169,8 @@
if (enlistingThread == null || enlistingThread != currentThread)
{
- log.warn("Thread " + currentThread + " not the enlisting thread " + enlistingThread,
- new Exception("STACKTRACE"));
+ log.threadIsnotEnlistingThread(currentThread.toString(), enlistingThread.toString(),
+ new Exception("STACKTRACE"));
return;
}
@@ -326,7 +328,7 @@
}
catch (Throwable t)
{
- log.warn("Transaction " + tx + " error in before completion " + synch, t);
+ log.transactionErrorInBeforeCompletion(tx.toString(), synch.toString(), t);
}
}
@@ -344,7 +346,7 @@
}
catch (Throwable t)
{
- log.warn("Transaction " + tx + " error in after completion " + synch, t);
+ log.transactionErrorInAfterCompletion(tx.toString(), synch.toString(), t);
}
}
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerImpl.java 2011-06-03 03:08:11 UTC (rev 111515)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerImpl.java 2011-06-03 09:35:32 UTC (rev 111516)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.tx;
import org.jboss.jca.common.JBossResourceException;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.connectionmanager.AbstractConnectionManager;
import org.jboss.jca.core.connectionmanager.ConnectionRecord;
import org.jboss.jca.core.connectionmanager.TxConnectionManager;
@@ -132,7 +133,7 @@
public class TxConnectionManagerImpl extends AbstractConnectionManager implements TxConnectionManager
{
/** The logger */
- private static Logger log = Logger.getLogger(TxConnectionManager.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class, TxConnectionManager.class.getName());
/** Serial version uid */
private static final long serialVersionUID = 1L;
@@ -186,7 +187,7 @@
* Get the logger.
* @return The value
*/
- protected Logger getLogger()
+ protected CoreLogger getLogger()
{
return log;
}
@@ -358,7 +359,8 @@
JBossResourceException.rethrowAsResourceException("Error checking for a transaction.", t);
}
- log.tracef("getManagedConnection interleaving=%s , tx=%s", interleaving, trackByTransaction);
+ if (trace)
+ log.tracef("getManagedConnection interleaving=%s , tx=%s", interleaving, trackByTransaction);
return super.getManagedConnection(trackByTransaction, subject, cri);
}
@@ -420,7 +422,8 @@
}
catch (Throwable t)
{
- log.trace("Could not enlist in transaction on entering meta-aware object! " + cl, t);
+ if (trace)
+ log.trace("Could not enlist in transaction on entering meta-aware object! " + cl, t);
throw new JBossResourceException("Could not enlist in transaction on entering meta-aware object!", t);
}
@@ -444,13 +447,15 @@
//if there are no more handles and tx is complete, we can return to pool.
if (cl.isManagedConnectionFree())
{
- log.tracef("Disconnected isManagedConnectionFree=true cl=%s", cl);
+ if (trace)
+ log.tracef("Disconnected isManagedConnectionFree=true cl=%s", cl);
returnManagedConnection(cl, false);
}
else
{
- log.tracef("Disconnected isManagedConnectionFree=false cl=%s", cl);
+ if (trace)
+ log.tracef("Disconnected isManagedConnectionFree=false cl=%s", cl);
}
// Rethrow the error
@@ -504,7 +509,8 @@
if (eisProductVersion == null)
eisProductVersion = getJndiName();
- log.tracef("Generating XAResourceWrapper for TxConnectionManager (%s)", this);
+ if (trace)
+ log.tracef("Generating XAResourceWrapper for TxConnectionManager (%s)", this);
xaResource = txIntegration.createXAResourceWrapper(mc.getXAResource(), padXid,
isSameRMOverride,
@@ -513,7 +519,8 @@
}
else
{
- log.tracef("Not wrapping XAResource.");
+ if (trace)
+ log.tracef("Not wrapping XAResource.");
xaResource = mc.getXAResource();
}
More information about the jboss-cvs-commits
mailing list