Author: chug
Date: Wed Oct 17 15:36:05 2012
New Revision: 1399311
URL: http://svn.apache.org/viewvc?rev=1399311&view=rev
Log:
QPID-4373 fix ambiguous CLI args; restore C++ broker schema property
Modified:
qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h
qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/tests/run_acl_tests
qpid/trunk/qpid/specs/management-schema.xml
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h?rev=1399311&r1=1399310&r2=1399311&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/Acl.h Wed Oct 17 15:36:05 2012
@@ -81,6 +81,10 @@ public:
return transferAcl;
};
+ inline virtual uint16_t getMaxConnectTotal() {
+ return aclValues.aclMaxConnectTotal;
+ };
+
// create specilied authorise methods for cases that need faster matching as
needed.
virtual bool authorise(
const std::string& id,
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp?rev=1399311&r1=1399310&r2=1399311&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/AclPlugin.cpp Wed Oct 17 15:36:05 2012
@@ -43,8 +43,8 @@ struct AclOptions : public Options {
addOptions()
("acl-file", optValue(values.aclFile, "FILE"), "The
policy file to load from, loaded from data dir")
("max-connections" , optValue(values.aclMaxConnectTotal,
"N"), "The maximum combined number of connections allowed. 0 implies no
limit.")
- ("max-connections-per-user", optValue(values.aclMaxConnectPerUser,
"N"), "The maximum number of connections allowed per user. 0 implies no limit.")
- ("max-connections-per-ip" , optValue(values.aclMaxConnectPerIp,
"N"), "The maximum number of connections allowed per host IP address. 0
implies no limit.")
+ ("limit-connections-per-user",
optValue(values.aclMaxConnectPerUser, "N"), "The maximum number of connections
allowed per user. 0 implies no limit.")
+ ("limit-connections-per-ip" , optValue(values.aclMaxConnectPerIp,
"N"), "The maximum number of connections allowed per host IP address. 0
implies no limit.")
("max-queues-per-user", optValue(values.aclMaxQueuesPerUser,
"N"), "The maximum number of queues allowed per user. 0 implies no limit.")
;
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h?rev=1399311&r1=1399310&r2=1399311&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/AclModule.h Wed Oct 17 15:36:05 2012
@@ -132,6 +132,8 @@ namespace broker {
// doTransferAcl pervents time consuming ACL calls on a per-message
basis.
virtual bool doTransferAcl()=0;
+ virtual uint16_t getMaxConnectTotal()=0;
+
virtual bool authorise(
const std::string& id,
const acl::Action& action,
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=1399311&r1=1399310&r2=1399311&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Wed Oct 17 15:36:05 2012
@@ -351,6 +351,12 @@ Broker::Broker(const Broker::Options& co
// Initialize plugins
Plugin::initializeAll(*this);
+ if(conf.enableMgmt) {
+ if (getAcl()) {
+ mgmtObject->set_maxConns(getAcl()->getMaxConnectTotal());
+ }
+ }
+
if (managementAgent.get()) managementAgent->pluginsInitialized();
if (conf.queueCleanInterval) {
Modified: qpid/trunk/qpid/cpp/src/tests/run_acl_tests
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_acl_tests?rev=1399311&r1=1399310&r2=1399311&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_acl_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_acl_tests Wed Oct 17 15:36:05 2012
@@ -31,9 +31,9 @@ trap stop_brokers INT TERM QUIT
start_brokers() {
../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIR
--load-module $ACL_LIB --acl-file policy.acl --auth no
--log-to-file local.log > qpidd.port
LOCAL_PORT=`cat qpidd.port`
- ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRI
--load-module $ACL_LIB --acl-file policy.acl --auth no --max-connections-per-ip
2 --log-to-file locali.log > qpiddi.port
+ ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRI
--load-module $ACL_LIB --acl-file policy.acl --auth no
--limit-connections-per-ip 2 --log-to-file locali.log > qpiddi.port
LOCAL_PORTI=`cat qpiddi.port`
- ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRU
--load-module $ACL_LIB --acl-file policy.acl --auth no
--max-connections-per-user 2 --log-to-file localu.log > qpiddu.port
+ ../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRU
--load-module $ACL_LIB --acl-file policy.acl --auth no
--limit-connections-per-user 2 --log-to-file localu.log > qpiddu.port
LOCAL_PORTU=`cat qpiddu.port`
../qpidd --daemon --port 0 --no-module-dir --data-dir $DATA_DIRQ
--load-module $ACL_LIB --acl-file policy.acl --auth no --max-queues-per-user 2
--log-to-file localq.log > qpiddq.port
LOCAL_PORTQ=`cat qpiddq.port`
Modified: qpid/trunk/qpid/specs/management-schema.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/specs/management-schema.xml?rev=1399311&r1=1399310&r2=1399311&view=diff
==============================================================================
--- qpid/trunk/qpid/specs/management-schema.xml (original)
+++ qpid/trunk/qpid/specs/management-schema.xml Wed Oct 17 15:36:05 2012
@@ -81,6 +81,7 @@
<property name="systemRef" type="objId" references="System"
access="RO" desc="System ID" parentRef="y"/>
<property name="port" type="uint16" access="RO" desc="TCP Port
for AMQP Service"/>
<property name="workerThreads" type="uint16" access="RO" desc="Thread
pool size"/>
+ <property name="maxConns" type="uint16" access="RO" desc="Maximum
allowed connections"/>
<property name="connBacklog" type="uint16" access="RO"
desc="Connection backlog limit for listening socket"/>
<property name="stagingThreshold" type="uint32" access="RO" desc="Broker
stages messages over this size to disk"/>
<property name="mgmtPublish" type="bool" access="RO" desc="Broker's
management agent sends unsolicited data on the publish interval"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
