[hornetq-commits] JBoss hornetq SVN: r10614 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon May 9 13:05:18 EDT 2011
Author: clebert.suconic at jboss.com
Date: 2011-05-09 13:05:18 -0400 (Mon, 09 May 2011)
New Revision: 10614
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
Log:
Adding debug logs to Client topology
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-05-09 16:14:07 UTC (rev 10613)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-05-09 17:05:18 UTC (rev 10614)
@@ -17,7 +17,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -29,9 +28,12 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
-import org.hornetq.api.core.*;
+import org.hornetq.api.core.HornetQBuffer;
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Interceptor;
+import org.hornetq.api.core.SimpleString;
+import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClientSession;
-import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.core.client.ServerLocator;
import org.hornetq.api.core.client.SessionFailureListener;
import org.hornetq.core.logging.Logger;
@@ -230,8 +232,19 @@
{
if(live.equals(connectorConfig) && backUp != null)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Setting up backup config = " + backUp + " for live = " + live);
+ }
backupConfig = backUp;
}
+ else
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("ClientSessionFactoryImpl received backup update for live/backup pair = " + live + " / " + backUp + " but it didn't belong to " + this.connectorConfig);
+ }
+ }
}
public Object getBackupConnector()
@@ -875,6 +888,11 @@
return;
}
+ if (log.isDebugEnabled())
+ {
+ log.debug("Trying reconnection attempt " + count);
+ }
+
getConnection();
if (connection == null)
@@ -884,10 +902,10 @@
if (reconnectAttempts != 0)
{
count++;
-
+
if (reconnectAttempts != -1 && count == reconnectAttempts)
{
- log.warn("Tried " + reconnectAttempts + " times to connect. Now giving up.");
+ log.warn("Tried " + reconnectAttempts + " times to connect. Now giving up on reconnecting it.");
return;
}
@@ -989,10 +1007,20 @@
{
connector.start();
+ if (log.isDebugEnabled())
+ {
+ log.debug("Trying to connect at the main server using connector :" + connectorConfig);
+ }
+
tc = connector.createConnection();
if (tc == null)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Main server is not up. Hopefully there's a backup configured now!");
+ }
+
try
{
connector.close();
@@ -1004,9 +1032,13 @@
connector = null;
}
}
- //if connection fails we can try the backup incase it has come live
+ //if connection fails we can try the backup in case it has come live
if(connector == null && backupConfig != null)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Trying backup config = " + backupConfig);
+ }
ConnectorFactory backupConnectorFactory = instantiateConnectorFactory(backupConfig.getFactoryClassName());
connector = backupConnectorFactory.createConnector(backupConfig.getParams(),
handler,
@@ -1022,6 +1054,11 @@
if (tc == null)
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Backup is not active yet");
+ }
+
try
{
connector.close();
@@ -1035,6 +1072,12 @@
else
{
/*looks like the backup is now live, lets use that*/
+
+ if (log.isDebugEnabled())
+ {
+ log.debug("Connected to the backup at " + backupConfig);
+ }
+
connectorConfig = backupConfig;
backupConfig = null;
@@ -1244,10 +1287,18 @@
if (topMessage.isExit())
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Notifying " + topMessage.getNodeID() + " going down");
+ }
serverLocator.notifyNodeDown(topMessage.getNodeID());
}
else
{
+ if (log.isDebugEnabled())
+ {
+ log.debug("Node " + topMessage.getNodeID() + " going up, connector = " + topMessage.getPair() + ", isLast=" + topMessage.isLast());
+ }
serverLocator.notifyNodeUp(topMessage.getNodeID(),
topMessage.getPair(),
topMessage.isLast());
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-05-09 16:14:07 UTC (rev 10613)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-05-09 17:05:18 UTC (rev 10614)
@@ -46,7 +46,7 @@
*/
private Map<String, TopologyMember> topology = new HashMap<String, TopologyMember>();
- private boolean debug;
+ private boolean debug = log.isDebugEnabled();
public synchronized boolean addMember(String nodeId, TopologyMember member)
{
@@ -54,9 +54,9 @@
TopologyMember currentMember = topology.get(nodeId);
if (debug)
{
- System.out.println("adding = " + nodeId + ":" + member.getConnector());
- System.out.println("before----------------------------------");
- System.out.println(describe());
+ log.info("adding = " + nodeId + ":" + member.getConnector());
+ log.info("before----------------------------------");
+ log.info(describe());
}
if(currentMember == null)
{
@@ -87,9 +87,8 @@
}
if(debug)
{
-
- System.out.println("after----------------------------------updated=" + replaced);
- System.out.println(describe());
+ log.info("Topology updated=" + replaced);
+ log.info(describe());
}
return replaced;
}
@@ -97,6 +96,10 @@
public synchronized boolean removeMember(String nodeId)
{
TopologyMember member = topology.remove(nodeId);
+ if (debug)
+ {
+ log.info("Removing member " + member);
+ }
return (member != null);
}
More information about the hornetq-commits
mailing list