[jboss-cvs] JBossAS SVN: r111515 - in projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core: connectionmanager/listener and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 2 23:08:12 EDT 2011
Author: jeff.zhang
Date: 2011-06-02 23:08:11 -0400 (Thu, 02 Jun 2011)
New Revision: 111515
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/listener/AbstractConnectionListener.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
Log:
[JBJCA-592] Connection manager listener 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 02:16:16 UTC (rev 111514)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/CoreLogger.java 2011-06-03 03:08:11 UTC (rev 111515)
@@ -93,4 +93,81 @@
@LogMessage(level = ERROR)
@Message(id = 202, value = "SecurityContext setup failed since CallbackSecurity was null")
public void securityContextSetupFailedCallbackSecurityNull();
+
+
+ // CONNECTION MANAGER LISTENER (300)
+
+ /**
+ * Registered a null handle for managedConnection
+ * @param managedConnection The managedConnection instance
+ */
+ @LogMessage(level = INFO)
+ @Message(id = 301, value = "Registered a null handle for managedConnection: %s")
+ public void registeredNullHandleManagedConnection(String managedConnection);
+
+ /**
+ * Unregistered handle that was not registered
+ * @param handle Unregistered handle
+ * @param managedConnection The managedConnection instance
+ */
+ @LogMessage(level = INFO)
+ @Message(id = 302, value = "Unregistered handle that was not registered! %s" +
+ " for managedConnection: %s")
+ public void unregisteredHandleNotRegistered(Object handle, String managedConnection);
+
+ /**
+ * Unregistered a null handle for managedConnection
+ * @param managedConnection The managedConnection instance
+ */
+ @LogMessage(level = INFO)
+ @Message(id = 303, value = "Registered a null handle for managedConnection: %s")
+ public void unregisteredNullHandleManagedConnection(String managedConnection);
+
+ /**
+ * Connection error occured
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 305, value = "Connection error occured: %s")
+ public void connectionErrorOccured(@Cause Throwable t);
+
+ /**
+ * Unknown Connection error occured
+ * @param t The exception
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 306, value = "Unknown Connection error occured: %s")
+ public void unknownConnectionErrorOccured(@Cause Throwable t);
+
+
+ /**
+ * Notified of error on a different managed connection
+ */
+ @LogMessage(level = WARN)
+ @Message(id = 307, value = "Notified of error on a different managed connection?")
+ public void notifiedErrorDifferentManagedConnection();
+
+ /**
+ * throwable from unregister connection
+ * @param t The exception
+ */
+ @LogMessage(level = INFO)
+ @Message(id = 311, value = "throwable from unregister connection")
+ public void throwableFromUnregisterConnection(@Cause Throwable t);
+
+ /**
+ * Error while closing connection handle
+ * @param t The exception
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 312, value = "Error while closing connection handle")
+ public void errorWhileClosingConnectionHandle(@Cause Throwable t);
+
+ /**
+ * There is something wrong with the pooling
+ * @param t The exception
+ */
+ @LogMessage(level = ERROR)
+ @Message(id = 313, value = "There is something wrong with the pooling?")
+ public void somethingWrongWithPooling(@Cause Throwable t);
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java 2011-06-03 02:16:16 UTC (rev 111514)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java 2011-06-03 03:08:11 UTC (rev 111515)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.listener;
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.ConnectionManager;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
@@ -35,8 +36,6 @@
import javax.resource.spi.ManagedConnection;
import javax.transaction.SystemException;
-import org.jboss.logging.Logger;
-
/**
* Abstract implementation of the {@link ConnectionListener} interface
* contract.
@@ -47,7 +46,7 @@
*/
public abstract class AbstractConnectionListener implements ConnectionListener
{
- private final Logger log;
+ private final CoreLogger log;
/** Log trace */
protected boolean trace;
@@ -126,7 +125,7 @@
* Get the logger
* @return The value
*/
- protected abstract Logger getLogger();
+ protected abstract CoreLogger getLogger();
/**
* {@inheritDoc}
@@ -217,7 +216,7 @@
}
else
{
- log.info("Registered a null handle for managedConnection: " + managedConnection);
+ log.registeredNullHandleManagedConnection(managedConnection.toString());
}
}
@@ -261,13 +260,12 @@
{
if (!connectionHandles.remove(handle))
{
- log.info("Unregistered handle that was not registered! " + handle + " for managedConnection: " +
- managedConnection);
+ log.unregisteredHandleNotRegistered(handle, managedConnection.toString());
}
}
else
{
- log.info("Unregistered a null handle for managedConnection: " + managedConnection);
+ log.unregisteredNullHandleManagedConnection(managedConnection.toString());
}
if (trace)
@@ -329,12 +327,12 @@
cause = new Exception("No exception was reported");
}
- log.warn("Connection error occured: " + this, cause);
+ log.connectionErrorOccured(cause);
}
else
{
Throwable cause = new Exception("No exception was reported");
- log.warn("Unknown Connection error occured: " + this, cause);
+ log.unknownConnectionErrorOccured(cause);
}
}
@@ -349,7 +347,7 @@
if (event != null && event.getSource() != getManagedConnection())
{
- log.warn("Notified of error on a different managed connection?");
+ log.notifiedErrorDifferentManagedConnection();
}
getConnectionManager().returnManagedConnection(this, true);
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java 2011-06-03 02:16:16 UTC (rev 111514)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java 2011-06-03 03:08:11 UTC (rev 111515)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.listener;
import org.jboss.jca.common.api.metadata.common.FlushStrategy;
+import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
@@ -40,7 +41,8 @@
public class NoTxConnectionListener extends AbstractConnectionListener
{
/** The logger */
- private static Logger log = Logger.getLogger(NoTxConnectionListener.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class,
+ NoTxConnectionListener.class.getName());
/**
* Creates a new no-tx listener.
@@ -59,7 +61,7 @@
/**
* {@inheritDoc}
*/
- protected Logger getLogger()
+ protected CoreLogger getLogger()
{
return log;
}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java 2011-06-03 02:16:16 UTC (rev 111514)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java 2011-06-03 03:08:11 UTC (rev 111515)
@@ -23,6 +23,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.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
import org.jboss.jca.core.connectionmanager.transaction.TransactionSynchronizer;
@@ -54,7 +55,8 @@
public class TxConnectionListener extends AbstractConnectionListener
{
/** The logger */
- private static Logger log = Logger.getLogger(TxConnectionListener.class);
+ private static CoreLogger log = Logger.getMessageLogger(CoreLogger.class,
+ TxConnectionListener.class.getName());
/**Transaction synch. instance*/
private TransactionSynchronization transactionSynchronization;
@@ -93,7 +95,7 @@
/**
* {@inheritDoc}
*/
- protected Logger getLogger()
+ protected CoreLogger getLogger()
{
return log;
}
@@ -339,7 +341,7 @@
}
catch (Throwable t)
{
- log.info("throwable from unregister connection", t);
+ log.throwableFromUnregisterConnection(t);
}
}
@@ -360,7 +362,7 @@
}
catch (Throwable t)
{
- log.error("Error while closing connection handle!", t);
+ log.errorWhileClosingConnectionHandle(t);
this.getConnectionManager().returnManagedConnection(this, true);
}
}
@@ -528,9 +530,9 @@
if (this.enlistError != null)
{
String error = "Error enlisting resource in transaction=" + this.currentTx;
- if (TxConnectionListener.this.trace)
+ if (trace)
{
- TxConnectionListener.this.log.trace(error + " " + TxConnectionListener.this);
+ log.trace(error + " " + TxConnectionListener.this);
}
// Wrap the error to give a reasonable stacktrace since the resource
@@ -564,9 +566,9 @@
*/
public boolean enlist()
{
- if (TxConnectionListener.this.trace)
+ if (trace)
{
- TxConnectionListener.this.log.trace("Enlisting resource " + TxConnectionListener.this);
+ log.trace("Enlisting resource " + TxConnectionListener.this);
}
try
{
@@ -639,7 +641,7 @@
String message = "afterCompletion called with wrong tx! Expected: " +
this + ", actual: " + transactionSynchronization;
IllegalStateException e = new IllegalStateException(message);
- log.error("There is something wrong with the pooling?", e);
+ log.somethingWrongWithPooling(e);
}
}
// "Delist"
More information about the jboss-cvs-commits
mailing list