diff options
author | Charles E. Rolke <chug@apache.org> | 2012-08-22 15:50:27 +0000 |
---|---|---|
committer | Charles E. Rolke <chug@apache.org> | 2012-08-22 15:50:27 +0000 |
commit | 54f2e39e2562bd18dee924da4197adcf088e9551 (patch) | |
tree | 27953b7eb7742cbb7bcc7ca47ef0a6570464e9c1 | |
parent | a074fbf716ea57c64509ea3caa947f9dc5005eae (diff) | |
download | qpid-python-54f2e39e2562bd18dee924da4197adcf088e9551.tar.gz |
QPID-2393 Count queues. On disapproving a queue creation do management event and counting.
Get rid of stray debug statement.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2393@1376103 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/cpp/src/qpid/acl/AclResourceCounter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qpid/cpp/src/qpid/acl/AclResourceCounter.cpp b/qpid/cpp/src/qpid/acl/AclResourceCounter.cpp index 581c860883..66dfd0777e 100644 --- a/qpid/cpp/src/qpid/acl/AclResourceCounter.cpp +++ b/qpid/cpp/src/qpid/acl/AclResourceCounter.cpp @@ -41,9 +41,7 @@ namespace acl { // // ResourceCounter::ResourceCounter(Acl& a, uint16_t ql) : - acl(a), queueLimit(ql) { - QPID_LOG(critical, "ACL RESOURCE_COUNTER queueLimit:" << queueLimit); - } + acl(a), queueLimit(ql) {} ResourceCounter::~ResourceCounter() {} @@ -79,9 +77,9 @@ bool ResourceCounter::limitApproveLH( } if (emitLog) { QPID_LOG(trace, theTitle << theName - << " limit=" << theLimit - << " curValue=" << count - << " result=" << (result ? "allow" : "deny")); + << " limit=" << theLimit + << " curValue=" << count + << " result=" << (result ? "allow" : "deny")); } } return result; @@ -138,6 +136,8 @@ bool ResourceCounter::approveCreateQueue(const std::string& userId, const std::s QPID_LOG(error, "Client max queue count limit of " << queueLimit << " exceeded by '" << userId << "' creating queue '" << queueName << "'. Queue creation denied."); + + acl.reportQueueLimit(userId, queueName); } return okByQ; } |