You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2009/06/11 20:03:53 UTC

svn commit: r783866 - /qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp

Author: kpvdr
Date: Thu Jun 11 18:03:53 2009
New Revision: 783866

URL: http://svn.apache.org/viewvc?rev=783866&view=rev
Log:
Minor change to clarify queue size policy log messages

Modified:
    qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp?rev=783866&r1=783865&r2=783866&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueuePolicy.cpp Thu Jun 11 18:03:53 2009
@@ -60,19 +60,22 @@
 
 bool QueuePolicy::checkLimit(const QueuedMessage& m)
 {
-    bool exceeded = (maxSize && (size.get() + m.payload->contentSize()) > maxSize) || (maxCount && (count.get() + 1) > maxCount);
+    bool sizeExceeded = maxSize && (size.get() + m.payload->contentSize()) > maxSize;
+    bool countExceeded = maxCount && (count.get() + 1) > maxCount;
+    bool exceeded = sizeExceeded || countExceeded;
     if (exceeded) {
         if (!policyExceeded) {
             policyExceeded = true;
             if (m.queue) {
-                QPID_LOG(info, "Queue size exceeded policy for " << m.queue->getName());
+                if (sizeExceeded) QPID_LOG(info, "Queue cumulative message size exceeded policy for " << m.queue->getName());
+                if (countExceeded) QPID_LOG(info, "Queue message count exceeded policy for " << m.queue->getName());
             }
         }
     } else {
         if (policyExceeded) {
             policyExceeded = false;
             if (m.queue) {
-                QPID_LOG(info, "Queue size within policy for " << m.queue->getName());
+                QPID_LOG(info, "Queue cumulative message size and message count within policy for " << m.queue->getName());
             }
         }
     }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org