[hornetq-commits] JBoss hornetq SVN: r10820 - branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-06-16 21:48:12 -0400 (Thu, 16 Jun 2011)
New Revision: 10820

Modified:
   branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
Log:
tracing

Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java	2011-06-17 00:31:24 UTC (rev 10819)
+++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java	2011-06-17 01:48:12 UTC (rev 10820)
@@ -85,6 +85,8 @@
    private static final Logger log = Logger.getLogger(ClientSessionFactoryImpl.class);
    
    private static final boolean isTrace = log.isTraceEnabled();
+   
+   private static final boolean isDebug = log.isDebugEnabled();
 
    // Attributes
    // -----------------------------------------------------------------------------------
@@ -234,7 +236,7 @@
    {
       if(live.equals(connectorConfig) && backUp != null)
       {
-         if (log.isDebugEnabled())
+         if (isDebug)
          {
               log.debug("Setting up backup config = " + backUp + " for live = " + live);
          }
@@ -242,7 +244,7 @@
       }
       else
       {
-         if (log.isDebugEnabled())
+         if (isDebug)
          {
             log.debug("ClientSessionFactoryImpl received backup update for live/backup pair = " + live + " / " + backUp + " but it didn't belong to " + this.connectorConfig);
          }
@@ -928,6 +930,8 @@
 
    private void getConnectionWithRetry(final int reconnectAttempts)
    {
+      log.info("getConnectionWithRetry::" + reconnectAttempts);
+      
       long interval = retryInterval;
 
       int count = 0;
@@ -936,7 +940,7 @@
       {
          while (!exitLoop)
          {
-            if (log.isDebugEnabled())
+            if (isDebug)
             {
                log.debug("Trying reconnection attempt " + count);
             }
@@ -985,6 +989,7 @@
                }
                else
                {
+                  log.debug("Could not connect to any server. Didn't have reconnection configured on the ClientSessionFactory");
                   return;
                }
             }
@@ -1062,7 +1067,7 @@
             {
                connector.start();
 
-               if (log.isDebugEnabled())
+               if (isDebug)
                {
                   log.debug("Trying to connect at the main server using connector :" + connectorConfig);
                }
@@ -1071,7 +1076,7 @@
 
                if (tc == null)
                {
-                  if (log.isDebugEnabled())
+                  if (isDebug)
                   {
                      log.debug("Main server is not up. Hopefully there's a backup configured now!");
                   }
@@ -1090,7 +1095,7 @@
             //if connection fails we can try the backup in case it has come live
             if(connector == null && backupConfig != null)
             {
-               if (log.isDebugEnabled())
+               if (isDebug)
                {
                   log.debug("Trying backup config = " + backupConfig);
                }
@@ -1109,7 +1114,7 @@
 
                   if (tc == null)
                   {
-                     if (log.isDebugEnabled())
+                     if (isDebug)
                      {
                         log.debug("Backup is not active yet");
                      }
@@ -1128,7 +1133,7 @@
                   {
                      /*looks like the backup is now live, lets use that*/
                      
-                     if (log.isDebugEnabled())
+                     if (isDebug)
                      {
                         log.debug("Connected to the backup at " + backupConfig);
                      }
@@ -1145,7 +1150,7 @@
             {
                if (isTrace)
                {
-                  log.trace("No Backup configured!");
+                  log.trace("No Backup configured!", new Exception ("trace"));
                }
             }
          }
@@ -1185,11 +1190,20 @@
 
          if (tc == null)
          {
+            if (isDebug)
+            {
+               log.debug("returning connection = " + connection + " as tc == null");
+            }
             return connection;
          }
 
          connection = new RemotingConnectionImpl(tc, callTimeout, interceptors);
 
+         if (isDebug)
+         {
+            log.debug("Defined connection " + connection);
+         }
+         
          connection.addFailureListener(new DelegatingFailureListener(connection.getID()));
 
          Channel channel0 = connection.getChannel(0, -1);
@@ -1219,10 +1233,19 @@
 
          if (serverLocator.isHA())
          {
+            if (isDebug)
+            {
+               log.debug("Subscribing Topology");
+            }
+            
             channel0.send(new SubscribeClusterTopologyUpdatesMessage(serverLocator.isClusterConnection()));
             if (serverLocator.isClusterConnection())
             {
                TransportConfiguration config = serverLocator.getClusterTransportConfiguration();
+               if (isDebug)
+               {
+                  log.debug("Announcing node " + serverLocator.getNodeID() + ", isBackup=" + serverLocator.isBackup());
+               }
                channel0.send(new NodeAnnounceMessage(serverLocator.getNodeID(),
                                                      serverLocator.isBackup(),
                                                      config));
@@ -1349,7 +1372,7 @@
 
             if (topMessage.isExit())
             {
-               if (log.isDebugEnabled())
+               if (isDebug)
                {
                   log.debug("Notifying " + topMessage.getNodeID() + " going down");
                }
@@ -1357,7 +1380,7 @@
             }
             else
             {
-               if (log.isDebugEnabled())
+               if (isDebug)
                {
                   log.debug("Node " + topMessage.getNodeID() + " going up, connector = " + topMessage.getPair() + ", isLast=" + topMessage.isLast());
                }