[jboss-cvs] JBoss Messaging SVN: r1376 - in trunk/src/main/org/jboss: jms/client/remoting jms/server/destination messaging/core/plugin messaging/core/plugin/postoffice/cluster
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 28 12:54:25 EDT 2006
Author: timfox
Date: 2006-09-28 12:54:19 -0400 (Thu, 28 Sep 2006)
New Revision: 1376
Modified:
trunk/src/main/org/jboss/jms/client/remoting/CallbackManager.java
trunk/src/main/org/jboss/jms/server/destination/QueueService.java
trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultRouter.java
Log:
Removed extraneous log lines
Modified: trunk/src/main/org/jboss/jms/client/remoting/CallbackManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/CallbackManager.java 2006-09-28 16:37:36 UTC (rev 1375)
+++ trunk/src/main/org/jboss/jms/client/remoting/CallbackManager.java 2006-09-28 16:54:19 UTC (rev 1376)
@@ -76,22 +76,14 @@
private Long calcLookup(int serverId, int consumerId)
{
- log.info("calculating lookup for server:" + serverId + " consumer:" + consumerId);
long id1 = serverId;
id1 <<= 32;
-
- log.info("id1 is " + Long.toBinaryString(id1));
-
+
long id2 = consumerId;
- log.info("id2 is " + Long.toBinaryString(id2));
-
long lookup = id1 | id2;
- log.info("lookup is " + Long.toBinaryString(lookup));
-
-
return new Long(lookup);
}
@@ -104,13 +96,9 @@
MessagingMarshallable mm = (MessagingMarshallable)ir.getParameter();
ClientDelivery dr = (ClientDelivery)mm.getLoad();
-
- log.info("received message(s) from server " + dr.getServerId());
-
+
Long lookup = calcLookup(dr.getServerId(), dr.getConsumerId());
-
- log.info("lookup key is " + lookup);
-
+
List msgs = dr.getMessages();
MessageCallbackHandler handler =
Modified: trunk/src/main/org/jboss/jms/server/destination/QueueService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/QueueService.java 2006-09-28 16:37:36 UTC (rev 1375)
+++ trunk/src/main/org/jboss/jms/server/destination/QueueService.java 2006-09-28 16:54:19 UTC (rev 1376)
@@ -91,9 +91,7 @@
Binding binding = postOffice.getBindingForQueueName(destination.getName());
if (binding != null)
- {
- log.info("binding already exists");
-
+ {
PagingFilteredQueue queue = (PagingFilteredQueue)binding.getQueue();
queue.setPagingParams(destination.getFullSize(), destination.getPageSize(), destination.getDownCacheSize());
@@ -110,8 +108,6 @@
if (postOffice.isLocal())
{
- log.info("Binding non clustered");
-
queue = new PagingFilteredQueue(destination.getName(), idm.getId(), ms, pm, true, true,
executor, null,
destination.getFullSize(), destination.getPageSize(), destination.getDownCacheSize());
@@ -120,8 +116,6 @@
}
else
{
- log.info("binding clustered");
-
queue = new LocalClusteredQueue(postOffice, nodeId, destination.getName(), idm.getId(), ms, pm, true, true,
executor, null, tr,
destination.getFullSize(), destination.getPageSize(), destination.getDownCacheSize());
Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2006-09-28 16:37:36 UTC (rev 1375)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCPersistenceManager.java 2006-09-28 16:54:19 UTC (rev 1376)
@@ -574,9 +574,7 @@
//First we order the references in message order
orderReferences(references);
-
- log.info("adding references: " + references.size());
-
+
try
{
//Now we get a lock on all the messages. Since we have ordered the refs we should avoid deadlock
@@ -1301,8 +1299,6 @@
{
//No tx so add the ref directly in the db
- log.info("Adding ref: " + ref);
-
TransactionWrapper wrap = new TransactionWrapper();
PreparedStatement psReference = null;
@@ -1325,12 +1321,9 @@
int rows = psReference.executeUpdate();
if (trace) { log.trace("Inserted " + rows + " rows"); }
-
- log.info("Inserted " + rows + " rows");
-
+
if (!m.isPersisted())
{
- log.info(m + " Not persisted so inserting message");
// First time so persist the message
psMessage = conn.prepareStatement(getSQLStatement("INSERT_MESSAGE"));
@@ -1340,8 +1333,6 @@
}
else
{
- log.info("Already persisted so updating message");
-
//Update the message's channel count
psMessage = conn.prepareStatement(getSQLStatement("INC_CHANNELCOUNT"));
@@ -1418,8 +1409,6 @@
{
//No tx so we remove the reference directly from the db
- log.info("Removing ref: " + ref);
-
TransactionWrapper wrap = new TransactionWrapper();
PreparedStatement psReference = null;
@@ -1437,8 +1426,6 @@
psReference = conn.prepareStatement(getSQLStatement("DELETE_MESSAGE_REF"));
- log.info("Removing ref " + ref + " from channel " + channelID);
-
//Remove the message reference
removeReference(channelID, ref, psReference);
@@ -1706,8 +1693,6 @@
protected void handleBeforeCommit1PC(List refsToAdd, List refsToRemove, Transaction tx)
throws Exception
{
- log.info("Before commit 1pc: I have " + refsToAdd.size() + " refs to add and " + refsToRemove.size() + " refs to remove");
-
//TODO - A slight optimisation - it's possible we have refs referring to the same message
//so we will end up acquiring the lock more than once which is unnecessary
//If find unique set of messages can avoid this
@@ -1776,7 +1761,6 @@
}
//Now store the reference
- log.info("Adding ref: " + ref + " in channel: " + pair.channelId);
addReference(pair.channelId, ref, psReference, false);
if (batch)
@@ -1803,8 +1787,7 @@
boolean added;
if (!m.isPersisted())
- {
- log.info("The message " + m.getMessageID() + " hasn't been persisted before so i'm gonna persist it");
+ {
//First time so add message
storeMessage(m, psInsertMessage);
@@ -1813,8 +1796,7 @@
m.setPersisted(true);
}
else
- {
- log.info("The message " + m.getMessageID() + " has been peristed before so just updating it's channel count");
+ {
//Update message channel count
incrementChannelCount(m, psIncMessage);
@@ -1911,8 +1893,6 @@
removeReference(pair.channelId, pair.ref, psReference);
- log.info("Removing ref " + pair.ref + " in tx");
-
if (batch)
{
psReference.addBatch();
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 2006-09-28 16:37:36 UTC (rev 1375)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java 2006-09-28 16:54:19 UTC (rev 1376)
@@ -240,9 +240,7 @@
// --------------------------------------------------------------
public synchronized void start() throws Exception
- {
- log.info("DefaultClusteredPosttoffic::start");
-
+ {
if (syncChannelConfigE != null)
{
this.syncChannel = new JChannel(syncChannelConfigE);
@@ -360,9 +358,7 @@
boolean routed = false;
lock.readLock().acquire();
-
- log.info(this.nodeId + " routing reference " + ref);
-
+
try
{
ClusteredBindings cb = (ClusteredBindings)conditionMap.get(condition);
@@ -1078,23 +1074,17 @@
protected Binding createBinding(int nodeId, String condition, String queueName, long channelId, String filterString, boolean durable) throws Exception
{
Filter filter = filterFactory.createFilter(filterString);
-
- log.info("Created binding");
-
+
Queue queue;
if (nodeId == this.nodeId)
{
QueuedExecutor executor = (QueuedExecutor)pool.get();
- log.info("created local clustered queue");
-
queue = new LocalClusteredQueue(this, nodeId, queueName, channelId, ms, pm, true,
durable, executor, filter, tr);
}
else
{
- log.info("created remote queue stub");
-
queue = new RemoteQueueStub(nodeId, queueName, channelId, durable, pm, filter);
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultRouter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultRouter.java 2006-09-28 16:37:36 UTC (rev 1375)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultRouter.java 2006-09-28 16:54:19 UTC (rev 1376)
@@ -144,17 +144,13 @@
public Delivery handle(DeliveryObserver observer, MessageReference reference, Transaction tx)
{
//Favour the local queue
-
- log.info("router handling ref, it has " + this.queues.size());
-
+
if (localQueue != null)
{
//The only time the local queue won't accept is if the selector doesn't
//match - in which case it won't match at any other nodes too so no point
//in trying them
- log.info("sending to local queue");
-
Delivery del = localQueue.handle(observer, reference, tx);
return del;
@@ -163,8 +159,6 @@
{
//There is no local shared queue
- log.info("There is no local queue");
-
//We round robin among the rest
if (!queues.isEmpty())
{
More information about the jboss-cvs-commits
mailing list