diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-04-22 11:31:01 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-04-22 11:31:01 +0100 |
| commit | 85cc3176802c207dcb57aaa0910f8d94a2f7bddb (patch) | |
| tree | 0570bee85dc3c02b642cf178f80efa3d249f33e2 /src | |
| parent | ead0bc05d05609c6d53d096d972e786441ce267a (diff) | |
| parent | 80d972249275e58c058e8aabc78273e63f344286 (diff) | |
| download | rabbitmq-server-85cc3176802c207dcb57aaa0910f8d94a2f7bddb.tar.gz | |
merge v1_5 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control.erl | 13 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 11 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 6 |
4 files changed, 31 insertions, 1 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index e6717d68..6649899a 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -38,6 +38,19 @@ -define(RPC_TIMEOUT, 30000). +%%---------------------------------------------------------------------------- + +-ifdef(use_specs). + +-spec(start/0 :: () -> no_return()). +-spec(stop/0 :: () -> 'ok'). +-spec(action/4 :: (atom(), erlang_node(), [string()], + fun ((string(), [any()]) -> 'ok')) -> 'ok'). + +-endif. + +%%---------------------------------------------------------------------------- + start() -> FullCommand = init:get_plain_arguments(), #params{quiet = Quiet, node = Node, command = Command, args = Args} = diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index af3454f2..eced0b3c 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -106,7 +106,7 @@ -spec(dirty_dump_log/1 :: (string()) -> 'ok' | {'error', any()}). -spec(append_file/2 :: (string(), string()) -> 'ok' | {'error', any()}). -spec(ensure_parent_dirs_exist/1 :: (string()) -> 'ok'). --spec(format_stderr/2 :: (string(), [any()]) -> 'true'). +-spec(format_stderr/2 :: (string(), [any()]) -> 'ok'). -spec(start_applications/1 :: ([atom()]) -> 'ok'). -spec(stop_applications/1 :: ([atom()]) -> 'ok'). diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 5e8edd53..d9197535 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -36,6 +36,17 @@ -define(RPC_SLEEP, 500). +%%---------------------------------------------------------------------------- + +-ifdef(use_specs). + +-spec(start/0 :: () -> no_return()). +-spec(stop/0 :: () -> 'ok'). + +-endif. + +%%---------------------------------------------------------------------------- + start() -> RpcTimeout = case init:get_argument(maxwait) of diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 7d5fe2c1..8f0a3a89 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -487,7 +487,13 @@ test_cluster_management2(SecondaryNode) -> ok = control_action(stop_app, []), {error, {no_running_cluster_nodes, _, _}} = control_action(reset, []), + + %% leave system clustered, with the secondary node as a ram node ok = control_action(force_reset, []), + ok = control_action(start_app, []), + ok = control_action(force_reset, SecondaryNode, []), + ok = control_action(cluster, SecondaryNode, [NodeS]), + ok = control_action(start_app, SecondaryNode, []), passed. |