QPID-4514: Remove obsolete cluster code: AclConnectionCounter

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1424124 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 31 insertions, 61 deletions

diff --git a/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp b/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
index 052fa3c222..195d8bee28 100644
--- a/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
+++ b/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
@@ -226,74 +226,44 @@ bool ConnectionCounter::approveConnection(const broker::Connection& connection)
     bool okTotal  = true;
     if (totalLimit > 0) {
         okTotal = totalCurrentConnections <= totalLimit;
-        if (!connection.isShadow()) {
-            QPID_LOG(trace, "ACL ConnectionApprover totalLimit=" << totalLimit
-                << " curValue=" << totalCurrentConnections
-                << " result=" << (okTotal ? "allow" : "deny"));
-        }
+        QPID_LOG(trace, "ACL ConnectionApprover totalLimit=" << totalLimit
+                 << " curValue=" << totalCurrentConnections
+                 << " result=" << (okTotal ? "allow" : "deny"));
     }
 
     // Approve by IP host connections
-    bool okByIP   = limitApproveLH(connectByHostMap, hostName, hostLimit, !connection.isShadow());
+    bool okByIP   = limitApproveLH(connectByHostMap, hostName, hostLimit, true);
 
     // Count and Approve the connection by the user
-    bool okByUser = countConnectionLH(connectByNameMap, userName, nameLimit, !connection.isShadow());
-
-    if (!connection.isShadow()) {
-        // Emit separate log for each disapproval
-        if (!okTotal) {
-            QPID_LOG(error, "Client max total connection count limit of " << totalLimit
-                << " exceeded by '"
-                << connection.getMgmtId() << "', user: '"
-                << userName << "'. Connection refused");
-        }
-        if (!okByIP) {
-            QPID_LOG(error, "Client max per-host connection count limit of "
-                << hostLimit << " exceeded by '"
-                << connection.getMgmtId() << "', user: '"
-                << userName << "'. Connection refused.");
-        }
-        if (!okByUser) {
-            QPID_LOG(error, "Client max per-user connection count limit of "
-                << nameLimit << " exceeded by '"
-                << connection.getMgmtId() << "', user: '"
-                << userName << "'. Connection refused.");
-        }
-
-        // Count/Event once for each disapproval
-        bool result = okTotal && okByIP && okByUser;
-        if (!result) {
-            acl.reportConnectLimit(userName, hostName);
-        }
+    bool okByUser = countConnectionLH(connectByNameMap, userName, nameLimit, true);
+
+    // Emit separate log for each disapproval
+    if (!okTotal) {
+        QPID_LOG(error, "Client max total connection count limit of " << totalLimit
+                 << " exceeded by '"
+                 << connection.getMgmtId() << "', user: '"
+                 << userName << "'. Connection refused");
+    }
+    if (!okByIP) {
+        QPID_LOG(error, "Client max per-host connection count limit of "
+                 << hostLimit << " exceeded by '"
+                 << connection.getMgmtId() << "', user: '"
+                 << userName << "'. Connection refused.");
+    }
+    if (!okByUser) {
+        QPID_LOG(error, "Client max per-user connection count limit of "
+                 << nameLimit << " exceeded by '"
+                 << connection.getMgmtId() << "', user: '"
+                 << userName << "'. Connection refused.");
+    }
 
-        return result;
-    } else {
-        // Always allow shadow connections
-        if (!okTotal) {
-            QPID_LOG(warning, "Client max total connection count limit of " << totalLimit
-                << " exceeded by '"
-                << connection.getMgmtId() << "', user: '"
-                << userName << "' but still within tolerance. Cluster connection allowed");
-        }
-        if (!okByIP) {
-            QPID_LOG(warning, "Client max per-host connection count limit of "
-                << hostLimit << " exceeded by '"
-                << connection.getMgmtId() << "', user: '"
-                << userName << "' but still within tolerance. Cluster connection allowed");
-        }
-        if (!okByUser) {
-            QPID_LOG(warning, "Client max per-user connection count limit of "
-                << nameLimit << " exceeded by '"
-                << connection.getMgmtId() << "', user: '"
-                << userName << "' but still within tolerance. Cluster connection allowed");
-        }
-        if (okTotal && okByIP && okByUser) {
-            QPID_LOG(debug, "Cluster client connection: '"
-                << connection.getMgmtId() << "', user '"
-                <<  userName << "' allowed");
-        }
-        return true;
+    // Count/Event once for each disapproval
+    bool result = okTotal && okByIP && okByUser;
+    if (!result) {
+        acl.reportConnectLimit(userName, hostName);
     }
+
+    return result;
 }
 
 //