summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/ha/HaPlugin.cpp
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2012-02-24 20:05:47 +0000
committerAlan Conway <aconway@apache.org>2012-02-24 20:05:47 +0000
commit2078f6b75939a6c67493760829fe0b50101d91de (patch)
treee3764fa200a289cd4bd18d5151dcf8bbb7d75bf2 /cpp/src/qpid/ha/HaPlugin.cpp
parentc0d6df78da8b901ad05f8932933f5106e16bafa2 (diff)
downloadqpid-python-2078f6b75939a6c67493760829fe0b50101d91de.tar.gz
QPID-3603: Improved command-based qpid-ha tool and ha config option names.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1293397 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/ha/HaPlugin.cpp')
-rw-r--r--cpp/src/qpid/ha/HaPlugin.cpp20
1 files changed, 14 insertions, 6 deletions
diff --git a/cpp/src/qpid/ha/HaPlugin.cpp b/cpp/src/qpid/ha/HaPlugin.cpp
index e9b3d4d311..b3080330fb 100644
--- a/cpp/src/qpid/ha/HaPlugin.cpp
+++ b/cpp/src/qpid/ha/HaPlugin.cpp
@@ -31,12 +31,20 @@ struct Options : public qpid::Options {
Settings& settings;
Options(Settings& s) : qpid::Options("HA Options"), settings(s) {
addOptions()
- ("ha-enable", optValue(settings.enabled, "yes|no"), "Enable High Availability features")
- ("ha-client-url", optValue(settings.clientUrl,"URL"), "URL that clients use to connect and fail over.")
- ("ha-broker-url", optValue(settings.brokerUrl,"URL"), "URL that backup brokers use to connect and fail over.")
- ("ha-username", optValue(settings.username, "USER"), "Username for connections between brokers")
- ("ha-password", optValue(settings.password, "PASS"), "Password for connections between brokers")
- ("ha-mechanism", optValue(settings.mechanism, "MECH"), "Authentication mechanism for connections between brokers")
+ ("ha-cluster", optValue(settings.enabled, "yes|no"),
+ "Join a HA active/passive cluster.")
+ ("ha-brokers", optValue(settings.brokerUrl,"URL"),
+ "URL that backup brokers use to connect and fail over.")
+ ("ha-public-brokers", optValue(settings.clientUrl,"URL"),
+ "URL that clients use to connect and fail over, defaults to ha-brokers.")
+ ("ha-expected-backups", optValue(settings.expectedBackups, "N"),
+ "Number of backups expected to be active in the HA cluster.")
+ ("ha-username", optValue(settings.username, "USER"),
+ "Username for connections between HA brokers")
+ ("ha-password", optValue(settings.password, "PASS"),
+ "Password for connections between HA brokers")
+ ("ha-mechanism", optValue(settings.mechanism, "MECH"),
+ "Authentication mechanism for connections between HA brokers")
;
}
};