Menu
▾
▴
[jboss-cvs] jbossmq/src/main/org/jboss/mq/server JMSDestinationManager.java TracingInterceptor.java
|
From: Hiram C. <ch...@us...> - 2002-05-04 15:28:40
|
User: chirino
Date: 02/05/04 08:28:39
Modified: src/main/org/jboss/mq/server Tag: Branch_3_0
JMSDestinationManager.java TracingInterceptor.java
Log:
Moved all tracing logic into the TracingInterceptor, The trace info is more robust and will allow
you to run FASTER when you want to turn tracing off.
Revision Changes Path
No revision
No revision
1.1.2.2 +4 -38 jbossmq/src/main/org/jboss/mq/server/JMSDestinationManager.java
Index: JMSDestinationManager.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/JMSDestinationManager.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- JMSDestinationManager.java 4 May 2002 05:09:21 -0000 1.1.2.1
+++ JMSDestinationManager.java 4 May 2002 15:28:39 -0000 1.1.2.2
@@ -52,7 +52,7 @@
* @author Hiram Chirino (Coj...@ho...)
* @author David Maplesden (Dav...@or...)
* @author <a href="mailto:pr...@ti...">Peter Antman</a>
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
*/
public class JMSDestinationManager extends JMSServerInterceptorSupport
{
@@ -532,12 +532,8 @@
*/
public synchronized void connectionClosing(ConnectionToken dc) throws JMSException
{
- if( log.isTraceEnabled() )
- log.trace("JMSServer->connectionClosing(dc=" + dc + ")");
- if (dc == null)
- {
+ if (dc == null)
return;
- }
// Close it's ClientConsumer
ClientConsumer cq = (ClientConsumer)clientConsumers.remove(dc);
@@ -604,19 +600,8 @@
*/
public void subscribe(ConnectionToken dc, Subscription sub) throws JMSException
{
- try
- {
- if( log.isTraceEnabled() )
- log.trace("Server: subscribe(dest=" + sub.destination + ",idConnection=" + dc.getClientID() + ")");
- ClientConsumer clientConsumer = getClientConsumer(dc);
- clientConsumer.addSubscription(sub);
- }
- catch (JMSException e)
- {
- log.debug("Exception:", e);
- throw e;
- }
-
+ ClientConsumer clientConsumer = getClientConsumer(dc);
+ clientConsumer.addSubscription(sub);
}
/**
@@ -628,8 +613,6 @@
*/
public void unsubscribe(ConnectionToken dc, int subscriptionId) throws JMSException
{
- if( log.isTraceEnabled() )
- log.trace("Server: unsubscribe(idConnection=" + dc.getClientID() + ")");
ClientConsumer clientConsumer = getClientConsumer(dc);
clientConsumer.removeSubscription(subscriptionId);
}
@@ -695,9 +678,6 @@
*/
public synchronized Queue createQueue(ConnectionToken dc, String name) throws JMSException
{
- if (log.isDebugEnabled())
- log.debug("createQueue(" + name + ")");
-
SpyQueue newQueue = new SpyQueue(name);
if (!destinations.containsKey(newQueue))
{
@@ -716,9 +696,6 @@
*/
public synchronized Topic createTopic(ConnectionToken dc, String name) throws JMSException
{
- if (log.isDebugEnabled())
- log.debug("createTopic(" + name + ")");
-
SpyTopic newTopic = new SpyTopic(name);
if (!destinations.containsKey(newTopic))
{
@@ -735,9 +712,6 @@
*/
public synchronized void deleteTemporaryDestination(ConnectionToken dc, SpyDestination dest)
{
- if (log.isDebugEnabled())
- log.debug("deleteDestination(dest=" + dest.toString() + ")");
-
synchronized (destinations)
{
HashMap newMap = (HashMap)destinations.clone();
@@ -782,9 +756,6 @@
*/
public void addDestination(JMSDestination destination) throws JMSException
{
- if (log.isDebugEnabled())
- log.debug("addDestination: " + destination);
-
if (destinations.containsKey(destination.getSpyDestination())) {
throw new JMSException("This destination has allready been added to the server!");
}
@@ -819,9 +790,6 @@
*/
public void closeDestination(SpyDestination dest) throws JMSException
{
- if (log.isDebugEnabled())
- log.debug("closeDestination: " + dest);
-
JMSDestination destination = (JMSDestination)destinations.get(dest);
if (destination == null) {
throw new JMSException("This destination is not open!");
@@ -882,8 +850,6 @@
{
try
{
- if( log.isTraceEnabled() )
- log.trace("PING");
dc.clientIL.pong(System.currentTimeMillis());
}
catch (Exception e)
1.1.2.2 +398 -74 jbossmq/src/main/org/jboss/mq/server/TracingInterceptor.java
Index: TracingInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/TracingInterceptor.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TracingInterceptor.java 4 May 2002 05:09:21 -0000 1.1.2.1
+++ TracingInterceptor.java 4 May 2002 15:28:39 -0000 1.1.2.2
@@ -25,12 +25,13 @@
import org.jboss.mq.TransactionRequest;
import org.jboss.mq.Subscription;
+import org.apache.log4j.NDC;
import org.jboss.logging.Logger;
/**
* A pass through Interceptor, wich will trace all calls.
*
* @author <a href="mailto:pr...@ti...">Peter Antman</a>
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
*/
public class TracingInterceptor extends JMSServerInterceptorSupport {
@@ -41,9 +42,16 @@
* Get the thread group of the server.
*/
public ThreadGroup getThreadGroup() {
- if (log.isTraceEnabled())
- log.trace( "Calling getThreadGroup" );
- return getNext().getThreadGroup();
+ if( !log.isTraceEnabled() ) {
+ return getNext().getThreadGroup();
+ }
+
+ try {
+ log.trace( "CALLED : getThreadGroup" );
+ return getNext().getThreadGroup();
+ } finally {
+ log.trace( "RETURN : getThreadGroup" );
+ }
}
/**
@@ -54,12 +62,20 @@
*/
public String getID()
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling getID" );
- String ID = getNext().getID();
- if (log.isTraceEnabled())
- log.trace( "getID returning: " +ID);
- return ID;
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().getID();
+ }
+
+ try {
+ log.trace( "CALLED : getID" );
+ return getNext().getID();
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : getID: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : getID" );
+ }
}
/**
@@ -71,9 +87,23 @@
*/
public TemporaryTopic getTemporaryTopic(ConnectionToken dc)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling getTemporaryTopic " +dc);
- return getNext().getTemporaryTopic(dc);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().getTemporaryTopic(dc);
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : getTemporaryTopic" );
+ return getNext().getTemporaryTopic(dc);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : getTemporaryTopic: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : getTemporaryTopic" );
+ NDC.pop();
+ }
+
}
/**
@@ -85,9 +115,24 @@
*/
public TemporaryQueue getTemporaryQueue(ConnectionToken dc)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling getTemporaryQueue " +dc);
- return getNext().getTemporaryQueue(dc);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().getTemporaryQueue(dc);
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : getTemporaryQueue" );
+ return getNext().getTemporaryQueue(dc);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : getTemporaryQueue: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : getTemporaryQueue" );
+ NDC.pop();
+ }
+
+
}
/**
@@ -98,9 +143,25 @@
*/
public void connectionClosing(ConnectionToken dc)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling connectionClosing " +dc);
- getNext().connectionClosing(dc);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().connectionClosing(dc);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : connectionClosing" );
+ getNext().connectionClosing(dc);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : connectionClosing: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : connectionClosing" );
+ NDC.pop();
+ }
+
}
/**
@@ -111,9 +172,23 @@
*/
public void checkID(String ID)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling checkID" +ID);
- getNext().checkID(ID);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().checkID(ID);
+ return;
+ }
+
+ try {
+ log.trace( "CALLED : checkID" );
+ getNext().checkID(ID);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : checkID: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : checkID" );
+ }
+
}
/**
@@ -125,9 +200,25 @@
*/
public void addMessage(ConnectionToken dc, SpyMessage message)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling addMessage for " +dc);
- getNext().addMessage(dc,message);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().addMessage(dc,message);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : addMessage" );
+ getNext().addMessage(dc,message);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : addMessage: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : addMessage" );
+ NDC.pop();
+ }
+
}
/**
@@ -140,9 +231,23 @@
*/
public Queue createQueue(ConnectionToken dc, String dest)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling createQueue " +dest);
- return getNext().createQueue(dc,dest);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().createQueue(dc,dest);
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : createQueue" );
+ return getNext().createQueue(dc,dest);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : createQueue: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : createQueue" );
+ NDC.pop();
+ }
+
}
/**
@@ -155,9 +260,22 @@
*/
public Topic createTopic(ConnectionToken dc, String dest)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling createTopic " +dest);
- return getNext().createTopic(dc,dest);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().createTopic(dc,dest);
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : createTopic" );
+ return getNext().createTopic(dc,dest);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : createTopic: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : createTopic" );
+ NDC.pop();
+ }
}
/**
@@ -169,9 +287,24 @@
*/
public void deleteTemporaryDestination(ConnectionToken dc, SpyDestination dest)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling deleteTemporaryDestination " +dest);
- getNext().deleteTemporaryDestination(dc,dest);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().deleteTemporaryDestination(dc,dest);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : deleteTemporaryDestination" );
+ getNext().deleteTemporaryDestination(dc,dest);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : deleteTemporaryDestination: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : deleteTemporaryDestination" );
+ NDC.pop();
+ }
}
/**
@@ -183,9 +316,25 @@
*/
public void transact(ConnectionToken dc, TransactionRequest t)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling transact " +dc);
- getNext().transact(dc,t);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().transact(dc,t);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : transact" );
+ getNext().transact(dc,t);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : transact: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : transact" );
+ NDC.pop();
+ }
+
}
/**
@@ -197,9 +346,25 @@
*/
public void acknowledge(ConnectionToken dc, AcknowledgementRequest item)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling acknowledge " +dc);
- getNext().acknowledge(dc,item);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().acknowledge(dc,item);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : acknowledge" );
+ getNext().acknowledge(dc,item);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : acknowledge: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : acknowledge" );
+ NDC.pop();
+ }
+
}
/**
@@ -213,9 +378,23 @@
*/
public SpyMessage[] browse(ConnectionToken dc, Destination dest, String selector)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling browse " +dest);
- return getNext().browse(dc,dest,selector);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().browse(dc,dest,selector);
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : browse" );
+ return getNext().browse(dc,dest,selector);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : browse: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : browse" );
+ NDC.pop();
+ }
+
}
/**
@@ -229,9 +408,23 @@
*/
public SpyMessage receive(ConnectionToken dc, int subscriberId, long wait)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling reveice " +subscriberId);
- return getNext().receive(dc,subscriberId,wait);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().receive(dc,subscriberId,wait);
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : receive" );
+ return getNext().receive(dc,subscriberId,wait);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : receive: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : receive" );
+ NDC.pop();
+ }
+
}
/**
@@ -243,9 +436,25 @@
*/
public void setEnabled(ConnectionToken dc, boolean enabled)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling setEnabled " +enabled);
- getNext().setEnabled(dc,enabled);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().setEnabled(dc,enabled);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : setEnabled" );
+ getNext().setEnabled(dc,enabled);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : setEnabled: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : setEnabled" );
+ NDC.pop();
+ }
+
}
/**
@@ -257,9 +466,26 @@
*/
public void unsubscribe(ConnectionToken dc, int subscriptionId)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling unsubsribe " +subscriptionId);
- getNext().unsubscribe(dc,subscriptionId);
+
+
+ if( !log.isTraceEnabled() ) {
+ getNext().unsubscribe(dc,subscriptionId);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : unsubscribe" );
+ getNext().unsubscribe(dc,subscriptionId);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : unsubscribe: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : unsubscribe" );
+ NDC.pop();
+ }
+
}
/**
@@ -270,9 +496,25 @@
*/
public void destroySubscription(ConnectionToken dc,DurableSubscriptionID id)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling destroySubscription " +id);
- getNext().destroySubscription(dc,id);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().destroySubscription(dc,id);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : destroySubscription" );
+ getNext().destroySubscription(dc,id);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : destroySubscription: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : destroySubscription" );
+ NDC.pop();
+ }
+
}
/**
@@ -285,9 +527,21 @@
*/
public String checkUser(String userName, String password)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling checkUser " +userName + "/" + password);
- return getNext().checkUser(userName,password);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().checkUser(userName,password);
+ }
+
+ try {
+ log.trace( "CALLED : checkUser" );
+ return getNext().checkUser(userName,password);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : checkUser: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : checkUser" );
+ }
+
}
/**
@@ -300,9 +554,21 @@
*/
public String authenticate(String userName, String password)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling autenticate " +userName + "/" + password);
- return getNext().authenticate(userName,password);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().authenticate(userName,password);
+ }
+
+ try {
+ log.trace( "CALLED : authenticate" );
+ return getNext().authenticate(userName,password);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : authenticate: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : authenticate" );
+ }
+
}
/**
@@ -312,9 +578,25 @@
*/
public void subscribe(org.jboss.mq.ConnectionToken dc, org.jboss.mq.Subscription s)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling subscribe " +s);
- getNext().subscribe(dc,s);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().subscribe(dc,s);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : subscribe" );
+ getNext().subscribe(dc,s);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : subscribe: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : subscribe" );
+ NDC.pop();
+ }
+
}
/**
@@ -326,21 +608,63 @@
*/
public void ping(ConnectionToken dc, long clientTime)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling ping " +dc);
- getNext().ping(dc,clientTime);
+
+ if( !log.isTraceEnabled() ) {
+ getNext().ping(dc,clientTime);
+ return;
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : ping" );
+ getNext().ping(dc,clientTime);
+ return;
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : ping: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : ping" );
+ NDC.pop();
+ }
+
}
public SpyTopic getDurableTopic(DurableSubscriptionID sub)
throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling getDurableTopic " +sub);
- return getNext().getDurableTopic(sub);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().getDurableTopic(sub);
+ }
+
+ try {
+ log.trace( "CALLED : getDurableTopic" );
+ return getNext().getDurableTopic(sub);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : getDurableTopic: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : getDurableTopic" );
+ }
+
}
public Subscription getSubscription(ConnectionToken dc,int subscriberId) throws JMSException {
- if (log.isTraceEnabled())
- log.trace( "Calling getSubscription " +dc + " subId=" +subscriberId);
- return getNext().getSubscription(dc,subscriberId);
+
+ if( !log.isTraceEnabled() ) {
+ return getNext().getSubscription(dc,subscriberId);
+ }
+
+ try {
+ NDC.push(dc.getClientID());
+ log.trace( "CALLED : getSubscription" );
+ return getNext().getSubscription(dc,subscriberId);
+ } catch (JMSException e) {
+ log.trace( "EXCEPTION : getSubscription: ", e );
+ throw e;
+ } finally {
+ log.trace( "RETURN : getSubscription" );
+ NDC.pop();
+ }
+
}
-} // JMSServerInvokerSupport
+}
|