[jboss-cvs] JBoss Messaging SVN: r2498 - in trunk/src/main/org/jboss/messaging/core/plugin: postoffice/cluster and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-02-28 11:13:48 -0500 (Wed, 28 Feb 2007)
New Revision: 2498

Modified:
   trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
   trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
   trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
Log:
logging


Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java	2007-02-28 16:07:58 UTC (rev 2497)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java	2007-02-28 16:13:48 UTC (rev 2498)
@@ -2078,10 +2078,12 @@
                if (added)
                {
                   psInsertMessage.addBatch();
+                  if (trace) { log.trace("Message does not already exist so inserting it"); }
                   messageInsertsInBatch = true;
                }
                else
                { 
+                  if (trace) { log.trace("Message already exists so updating count"); }
                   psIncMessage.addBatch();
                   messageUpdatesInBatch = true;
                }
@@ -2090,11 +2092,13 @@
             {
                if (added)
                {
+                  if (trace) { log.trace("Message does not already exist so inserting it"); }
                   int rows = updateWithRetry(psInsertMessage);
                   if (trace) { log.trace("Inserted " + rows + " rows"); }
                }
                else
                {
+                  if (trace) { log.trace("Message already exists so updating count"); }
                   int rows = updateWithRetry(psIncMessage);
                   if (trace) { log.trace("Updated " + rows + " rows"); }
                }
@@ -2291,6 +2295,7 @@
          {
             try
             {
+               if (trace) { log.trace("Closing connection"); }
                conn.close();
             }
             catch (Throwable e)

Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java	2007-02-28 16:07:58 UTC (rev 2497)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java	2007-02-28 16:13:48 UTC (rev 2498)
@@ -48,6 +48,8 @@
 public class JDBCSupport implements MessagingComponent
 {
    private static final Logger log = Logger.getLogger(JDBCSupport.class);
+   
+   private static boolean trace = log.isTraceEnabled();
       
    protected DataSource ds;
    
@@ -273,10 +275,12 @@
             if (Status.STATUS_MARKED_ROLLBACK == tm.getStatus())
             {
                failed = true;
+               if (trace) { log.trace("Rolling back tx"); }
                tm.rollback();               
             }
             else
             {
+               if (trace) { log.trace("Committing tx"); }
                tm.commit();
             }
          }
@@ -284,6 +288,7 @@
          {
             if (oldTx != null && tm != null)
             {
+               if (trace) { log.trace("Resuming tx"); }
                tm.resume(oldTx);
             }
          }

Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java	2007-02-28 16:07:58 UTC (rev 2497)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java	2007-02-28 16:13:48 UTC (rev 2498)
@@ -1148,19 +1148,6 @@
 
                   Queue queue = (Queue)del.getObserver();
 
-                  if (trace)
-                  {
-                     if (queue.isClustered())
-                     {
-                        ClusteredQueue cq = (ClusteredQueue)queue;
-                        log.trace(this + " successfully routed message to " + (cq.isLocal() ? "LOCAL"  : "REMOTE") + " destination '" + cq.getName() + "' on node " + cq.getNodeId());
-                     }
-                     else
-                     {
-                        
-                     }
-                  }
-
                   if (queue.isClustered())
                   {
                      ClusteredQueue cq = (ClusteredQueue)queue;