diff options
Diffstat (limited to 'qpid/cpp/src/qpid/broker/Broker.cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/qpid/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp index 975acfdb87..4017fdbfe3 100644 --- a/qpid/cpp/src/qpid/broker/Broker.cpp +++ b/qpid/cpp/src/qpid/broker/Broker.cpp @@ -217,7 +217,9 @@ Broker::Broker(const Broker::Options& conf) : store(new NullMessageStore), acl(0), dataDir(conf.noDataDir ? std::string() : conf.dataDir), - pagingDir(conf.pagingDir), + pagingDir(!conf.pagingDir.empty() ? conf.pagingDir : + dataDir.isEnabled() ? dataDir.getPath() + Options::DEFAULT_PAGED_QUEUE_DIR : + std::string() ), queues(this), exchanges(this), links(this), @@ -385,11 +387,6 @@ Broker::Broker(const Broker::Options& conf) : } } -std::string Broker::getPagingDirectoryPath() -{ - return pagingDir.isEnabled() ? pagingDir.getPath() : dataDir.getPath(); -} - void Broker::declareStandardExchange(const std::string& name, const std::string& type) { bool storeEnabled = store.get() != NULL; @@ -1304,6 +1301,9 @@ std::pair<boost::shared_ptr<Queue>, bool> Broker::createQueue( params.insert(make_pair(acl::PROP_EXCLUSIVE, owner ? _TRUE : _FALSE)); params.insert(make_pair(acl::PROP_AUTODELETE, settings.autodelete ? _TRUE : _FALSE)); params.insert(make_pair(acl::PROP_POLICYTYPE, settings.getLimitPolicy())); + params.insert(make_pair(acl::PROP_PAGING, settings.paging ? _TRUE : _FALSE)); + params.insert(make_pair(acl::PROP_MAXPAGES, boost::lexical_cast<string>(settings.maxPages))); + params.insert(make_pair(acl::PROP_MAXPAGEFACTOR, boost::lexical_cast<string>(settings.pageFactor))); params.insert(make_pair(acl::PROP_MAXQUEUECOUNT, boost::lexical_cast<string>(settings.maxDepth.getCount()))); params.insert(make_pair(acl::PROP_MAXQUEUESIZE, boost::lexical_cast<string>(settings.maxDepth.getSize()))); params.insert(make_pair(acl::PROP_MAXFILECOUNT, boost::lexical_cast<string>(settings.maxFileCount))); |