summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/broker/Broker.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/broker/Broker.cpp')
-rw-r--r--cpp/src/qpid/broker/Broker.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 1d55db0c0f..117a93b571 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -60,6 +60,7 @@ namespace broker {
Broker::Options::Options(const std::string& name) :
qpid::Options(name),
+ noDataDir(0),
dataDir("/var/lib/qpidd"),
port(DEFAULT_PORT),
workerThreads(5),
@@ -75,6 +76,8 @@ Broker::Options::Options(const std::string& name) :
addOptions()
("data-dir", optValue(dataDir,"DIR"),
"Directory to contain persistent data generated by the broker")
+ ("no-data-dir", optValue(noDataDir),
+ "Don't use a data directory. No persistent configuration will be loaded or stored")
("port,p", optValue(port,"PORT"),
"Tells the broker to listen on PORT")
("worker-threads", optValue(workerThreads, "N"),
@@ -103,7 +106,7 @@ const std::string qpid_management("qpid.management");
Broker::Broker(const Broker::Options& conf) :
config(conf),
store(0),
- dataDir(conf.dataDir),
+ dataDir(conf.noDataDir ? std::string () : conf.dataDir),
factory(*this),
sessionManager(conf.ack)
{