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 | d04424dc3ecd88008b0b2c44fc5648a5b70647e5 (patch) | |
| tree | 4f60b0fa382f2bf0fc8b6b26e50c7f7b609ed183 /cpp | |
| parent | a90518dc4dac4a4065f729dbd1fb607a710bfd0c (diff) | |
| download | qpid-python-d04424dc3ecd88008b0b2c44fc5648a5b70647e5.tar.gz | |
Minor change to clarify queue size policy log messages
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@783866 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/qpid/broker/QueuePolicy.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/QueuePolicy.cpp b/cpp/src/qpid/broker/QueuePolicy.cpp index 43d914fc42..16fb9adf63 100644 --- a/cpp/src/qpid/broker/QueuePolicy.cpp +++ b/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()); } } } |