diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2009-06-11 18:03:53 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2009-06-11 18:03:53 +0000 |
| commit | 0a0bc029c425a21bafb5871a95c46fd338391ac2 (patch) | |
| tree | 4b9ab1e2dfbf5fa779646c86538f53989bf4c4fa | |
| parent | 814ffe24bd7c1941a06d7f5f2ab9b9a090f1b893 (diff) | |
| download | qpid-python-0a0bc029c425a21bafb5871a95c46fd338391ac2.tar.gz | |
Minor change to clarify queue size policy log messages
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@783866 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/broker/QueuePolicy.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/broker/QueuePolicy.cpp b/qpid/cpp/src/qpid/broker/QueuePolicy.cpp index 43d914fc42..16fb9adf63 100644 --- a/qpid/cpp/src/qpid/broker/QueuePolicy.cpp +++ b/qpid/cpp/src/qpid/broker/QueuePolicy.cpp @@ -60,19 +60,22 @@ void QueuePolicy::dequeued(uint64_t _size) 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()); } } } |