diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-04-16 10:55:47 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-04-16 10:55:47 +0100 |
| commit | dd07646f40a2ecdcd3637c08efb884dc563d580f (patch) | |
| tree | 1ac588e3c26e0329905a2579940fb424c64b19e8 /src | |
| parent | 097d47395bf810a2297d48dc15d0015ae5521bb9 (diff) | |
| parent | dd689096cfce851239646df70aaf1f22decd4d55 (diff) | |
| download | rabbitmq-server-git-dd07646f40a2ecdcd3637c08efb884dc563d580f.tar.gz | |
bringing in v1_5 before merge back
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 |
3 files changed, 25 insertions, 1 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index cbc11b4031..352d7e75c8 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 b15ad68ef4..1fcd9a61b4 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -105,7 +105,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'). -endif. diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 5e8edd53a1..d91975359a 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 |