You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2008/05/04 18:39:52 UTC

svn commit: r653249 - in /incubator/qpid/trunk/qpid/cpp/src/qpid/broker: Queue.cpp Queue.h

Author: gsim
Date: Sun May  4 09:39:52 2008
New Revision: 653249

URL: http://svn.apache.org/viewvc?rev=653249&view=rev
Log:
Extra log ouput for queue policy.


Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=653249&r1=653248&r2=653249&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Sun May  4 09:39:52 2008
@@ -61,7 +61,8 @@
     consumerCount(0),
     exclusive(0),
     noLocal(false),
-    persistenceId(0)
+    persistenceId(0),
+    policyExceeded(false)
 {
     if (parent != 0)
     {
@@ -420,6 +421,10 @@
     if (policy.get()) {
         policy->enqueued(msg->contentSize());
         if (policy->limitExceeded()) {
+            if (!policyExceeded) {
+                policyExceeded = true;
+                QPID_LOG(info, "Queue size exceeded policy for " << name);
+            }
             if (store) {
                 QPID_LOG(debug, "Message " << msg << " on " << name << " released from memory");
                 msg->releaseContent(store);
@@ -427,6 +432,11 @@
                 QPID_LOG(warning, "Message " << msg << " on " << name
                          << " exceeds the policy for the queue but can't be released from memory as the queue is not durable");
             }
+        } else {
+            if (policyExceeded) {
+                policyExceeded = false;
+                QPID_LOG(info, "Queue size within policy for " << name);
+            }
         }
     }
     notify();

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?rev=653249&r1=653248&r2=653249&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Sun May  4 09:39:52 2008
@@ -81,7 +81,8 @@
             mutable qpid::sys::Mutex ownershipLock;
             mutable uint64_t persistenceId;
             framing::FieldTable settings;
-            std::auto_ptr<QueuePolicy> policy;            
+            std::auto_ptr<QueuePolicy> policy;
+            bool policyExceeded;
             QueueBindings bindings;
             boost::shared_ptr<Exchange> alternateExchange;
             framing::SequenceNumber sequence;