diff options
| author | Alan Conway <aconway@apache.org> | 2012-02-13 23:50:18 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-02-13 23:50:18 +0000 |
| commit | 057a0635e081848ba59964c4a8e0923e521b7fe6 (patch) | |
| tree | cdad9578140d5dbdb2e90525e2ba9cc870ca50b6 /qpid/cpp/src/qpid/broker/Broker.h | |
| parent | cf61dbf9b313f9bd69b392eae8fd8d27d4e609a2 (diff) | |
| download | qpid-python-057a0635e081848ba59964c4a8e0923e521b7fe6.tar.gz | |
Merge branch 'qpid-3603-4-rebase' into qpid-3603-5qpid-3603-5
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3603-5@1243748 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/broker/Broker.h')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h index 840d47ac38..b6eab894f3 100644 --- a/qpid/cpp/src/qpid/broker/Broker.h +++ b/qpid/cpp/src/qpid/broker/Broker.h @@ -37,6 +37,8 @@ #include "qpid/broker/Vhost.h" #include "qpid/broker/System.h" #include "qpid/broker/ExpiryPolicy.h" +#include "qpid/broker/ConsumerFactory.h" +#include "qpid/broker/ConnectionObservers.h" #include "qpid/management/Manageable.h" #include "qpid/management/ManagementAgent.h" #include "qmf/org/apache/qpid/broker/Broker.h" @@ -122,6 +124,7 @@ public: uint16_t queueThresholdEventRatio; std::string defaultMsgGroup; bool timestampRcvMsgs; + double linkMaintenanceInterval; // FIXME aconway 2012-02-13: consistent parsing of SECONDS values. private: std::string getHome(); @@ -177,6 +180,7 @@ public: std::auto_ptr<MessageStore> store; AclModule* acl; DataDir dataDir; + ConnectionObservers connectionObservers; QueueRegistry queues; ExchangeRegistry exchanges; @@ -198,6 +202,7 @@ public: bool inCluster, clusterUpdatee; boost::intrusive_ptr<ExpiryPolicy> expiryPolicy; ConnectionCounter connectionCounter; + ConsumerFactories consumerFactories; public: virtual ~Broker(); @@ -356,6 +361,9 @@ public: const std::string& key, const std::string& userId, const std::string& connectionId); + + ConsumerFactories& getConsumerFactories() { return consumerFactories; } + ConnectionObservers& getConnectionObservers() { return connectionObservers; } }; }} |