diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-07-06 14:51:55 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-07-06 14:51:55 +0100 |
| commit | b9fe78d4d5c3db700b0b95924bcfada6be820a36 (patch) | |
| tree | 02f6d95ef5ae6343145b2bea57110bf5d038ce47 | |
| parent | 5057478f59d7e8e1a65d902799aaab69d557aa93 (diff) | |
| download | rabbitmq-server-b9fe78d4d5c3db700b0b95924bcfada6be820a36.tar.gz | |
updated docs and tests
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 34 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 16 |
2 files changed, 25 insertions, 25 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index 06648838..fa642f1b 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -271,23 +271,6 @@ <variablelist> <varlistentry> - <term><cmdsynopsis><command>force_cluster</command><arg choice="req" role="usage-option-list"><replaceable>clusternode</replaceable> ...</arg></cmdsynopsis></term> - <listitem> - <variablelist> - <varlistentry> - <term>clusternode</term> - <listitem><para>Subset of the nodes of the cluster to which this node should be connected.</para></listitem> - </varlistentry> - </variablelist> - <para> - Instruct the node to become member of a cluster with the - specified nodes. This will succeed even if the specified nodes - are offline. For a more detailed description, see - <command>cluster</command>. - </para> - </listitem> - </varlistentry> - <varlistentry> <term><cmdsynopsis><command>cluster</command><arg choice="req" role="usage-option-list"><replaceable>clusternode</replaceable> ...</arg></cmdsynopsis></term> <listitem> <variablelist> @@ -352,6 +335,23 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><cmdsynopsis><command>force_cluster</command><arg choice="req" role="usage-option-list"><replaceable>clusternode</replaceable> ...</arg></cmdsynopsis></term> + <listitem> + <variablelist> + <varlistentry> + <term>clusternode</term> + <listitem><para>Subset of the nodes of the cluster to which this node should be connected.</para></listitem> + </varlistentry> + </variablelist> + <para> + Instruct the node to become member of a cluster with the + specified nodes. This will succeed even if the specified nodes + are offline. For a more detailed description, see + <command>cluster</command>. + </para> + </listitem> + </varlistentry> </variablelist> </refsect2> diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 55d1f52e..e0147207 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -601,19 +601,19 @@ test_cluster_management() -> ok = control_action(reset, []), lists:foreach(fun (Arg) -> - ok = control_action(cluster, ["-f" | Arg]), + ok = control_action(force_cluster, Arg), ok end, ClusteringSequence), lists:foreach(fun (Arg) -> ok = control_action(reset, []), - ok = control_action(cluster, ["-f" | Arg]), + ok = control_action(force_cluster, Arg), ok end, ClusteringSequence), ok = control_action(reset, []), lists:foreach(fun (Arg) -> - ok = control_action(cluster, ["-f" | Arg]), + ok = control_action(force_cluster, Arg), ok = control_action(start_app, []), ok = control_action(stop_app, []), ok @@ -621,7 +621,7 @@ test_cluster_management() -> ClusteringSequence), lists:foreach(fun (Arg) -> ok = control_action(reset, []), - ok = control_action(cluster, ["-f" | Arg]), + ok = control_action(force_cluster, Arg), ok = control_action(start_app, []), ok = control_action(stop_app, []), ok @@ -632,13 +632,13 @@ test_cluster_management() -> ok = control_action(reset, []), ok = control_action(start_app, []), ok = control_action(stop_app, []), - ok = control_action(cluster, ["-f", "invalid1@invalid", - "invalid2@invalid"]), + ok = control_action(force_cluster, ["invalid1@invalid", + "invalid2@invalid"]), %% join a non-existing cluster as a ram node ok = control_action(reset, []), - ok = control_action(cluster, ["-f", "invalid1@invalid", - "invalid2@invalid"]), + ok = control_action(force_cluster, ["invalid1@invalid", + "invalid2@invalid"]), SecondaryNode = rabbit_misc:makenode("hare"), case net_adm:ping(SecondaryNode) of |