diff options
-rw-r--r-- | src/file_handle_cache.erl | 3 | ||||
-rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
-rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 | ||||
-rw-r--r-- | src/rabbit_command_assembler.erl | 2 | ||||
-rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 2 | ||||
-rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 11 | ||||
-rw-r--r-- | src/rabbit_networking.erl | 4 | ||||
-rw-r--r-- | src/rabbit_prelaunch.erl | 3 | ||||
-rw-r--r-- | src/rabbit_reader.erl | 6 |
9 files changed, 26 insertions, 9 deletions
diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl index 114fb9cb..9f6b2317 100644 --- a/src/file_handle_cache.erl +++ b/src/file_handle_cache.erl @@ -256,7 +256,7 @@ -spec(info_keys/0 :: () -> rabbit_types:info_keys()). -spec(info/0 :: () -> rabbit_types:infos()). -spec(info/1 :: ([atom()]) -> rabbit_types:infos()). --spec(ulimit/0 :: () -> 'infinity' | 'unknown' | non_neg_integer()). +-spec(ulimit/0 :: () -> 'unknown' | non_neg_integer()). -endif. @@ -811,7 +811,6 @@ init([]) -> Watermark; _ -> case ulimit() of - infinity -> infinity; unknown -> ?FILE_HANDLES_LIMIT_OTHER; Lim -> lists:max([2, Lim - ?RESERVED_FOR_OTHERS]) end diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 296120d9..0d8b9a82 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -48,7 +48,7 @@ -type(name() :: rabbit_types:r('queue')). -type(qlen() :: rabbit_types:ok(non_neg_integer())). --type(qfun(A) :: fun ((rabbit_types:amqqueue()) -> A)). +-type(qfun(A) :: fun ((rabbit_types:amqqueue()) -> A | no_return())). -type(qmsg() :: {name(), pid(), msg_id(), boolean(), rabbit_types:message()}). -type(msg_id() :: non_neg_integer()). -type(ok_or_errors() :: diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 70f86543..5279c07e 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -72,7 +72,7 @@ (rabbit_types:amqqueue()) -> rabbit_types:ok_pid_or_error()). -spec(info_keys/0 :: () -> rabbit_types:info_keys()). -spec(init_with_backing_queue_state/7 :: - (rabbit_types:amqqueue(), atom(), tuple(), any(), set(), + (rabbit_types:amqqueue(), atom(), tuple(), any(), [any()], [rabbit_types:delivery()], dict()) -> #q{}). -endif. diff --git a/src/rabbit_command_assembler.erl b/src/rabbit_command_assembler.erl index 85a20e7b..a0953eab 100644 --- a/src/rabbit_command_assembler.erl +++ b/src/rabbit_command_assembler.erl @@ -26,6 +26,8 @@ -ifdef(use_specs). +-export_type([frame/0]). + -type(frame_type() :: ?FRAME_METHOD | ?FRAME_HEADER | ?FRAME_BODY | ?FRAME_OOB_METHOD | ?FRAME_OOB_HEADER | ?FRAME_OOB_BODY | ?FRAME_TRACE | ?FRAME_HEARTBEAT). diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 82b87c76..8a3f1bc3 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -34,7 +34,7 @@ -spec(add_mirror/2 :: (rabbit_amqqueue:name(), node()) -> rabbit_types:ok_or_error(any())). -spec(add_mirror/3 :: - (rabbit_types:vhost(), rabbit_amqqueue:name(), node()) + (rabbit_types:vhost(), binary(), atom()) -> rabbit_types:ok_or_error(any())). -endif. diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index c918f388..3371380f 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -45,8 +45,19 @@ -behaviour(gm). -include("rabbit.hrl"). + +%%---------------------------------------------------------------------------- + -include("gm_specs.hrl"). +-ifdef(use_specs). +%% Shut dialyzer up +-spec(promote_me/2 :: (_, _) -> no_return()). +-endif. + +%%---------------------------------------------------------------------------- + + -define(SYNC_INTERVAL, 25). %% milliseconds -define(RAM_DURATION_UPDATE_INTERVAL, 5000). -define(DEATH_TIMEOUT, 20000). %% 20 seconds diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index db6e9310..c6b18248 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -74,7 +74,9 @@ -> [{inet:ip_address(), ip_port(), family(), atom()}]). -spec(ensure_ssl/0 :: () -> rabbit_types:infos()). -spec(ssl_transform_fun/1 :: - (rabbit_types:infos()) -> rabbit_types:ok_or_error(#ssl_socket{})). + (rabbit_types:infos()) + -> fun ((rabbit_net:socket()) + -> rabbit_types:ok_or_error(#ssl_socket{}))). -spec(boot/0 :: () -> 'ok'). -spec(start_client/1 :: diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index 92829e49..e3cf8ebe 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -29,6 +29,9 @@ -spec(start/0 :: () -> no_return()). -spec(stop/0 :: () -> 'ok'). +%% Shut dialyzer up +-spec(terminate/1 :: (string()) -> no_return()). +-spec(terminate/2 :: (string(), [any()]) -> no_return()). -endif. diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 95327246..bc1080f2 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -63,8 +63,6 @@ -ifdef(use_specs). --type(frame() :: [binary()]). - -spec(start_link/3 :: (pid(), pid(), rabbit_heartbeat:start_heartbeat_fun()) -> rabbit_types:ok(pid())). -spec(info_keys/0 :: () -> rabbit_types:info_keys()). @@ -90,7 +88,9 @@ -spec(system_continue/3 :: (_,_,#v1{}) -> any()). -spec(system_terminate/4 :: (_,_,_,_) -> none()). --spec(process_channel_frame/5 :: (frame(), pid(), non_neg_integer(), pid(), tuple()) -> tuple()). +-spec(process_channel_frame/5 :: + (rabbit_command_assembler:frame(), pid(), non_neg_integer(), pid(), + tuple()) -> tuple()). -endif. |