diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-09-10 11:24:14 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-09-10 11:24:14 +0100 |
| commit | 183007616bc81421ccd0bdf96f333591ca637b83 (patch) | |
| tree | 2d822375388de66a9ffc3ecb6672080d339fcfd0 | |
| parent | 215887d34c8964b3a83b5fa4929dc1d06bc8bf69 (diff) | |
| download | rabbitmq-server-183007616bc81421ccd0bdf96f333591ca637b83.tar.gz | |
Fix type spec, fix a behaviour warning.
| -rw-r--r-- | src/rabbit_amqqueue.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index aadedda7..e026279f 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -61,6 +61,8 @@ -type(ok_or_errors() :: 'ok' | {'error', [{'error' | 'exit' | 'throw', any()}]}). -type(absent_reason() :: 'nodedown' | 'crashed'). +-type(queue_or_absent() :: rabbit_types:amqqueue() | + {'absent', rabbit_types:amqqueue(),absent_reason()}). -type(not_found_or_absent() :: 'not_found' | {'absent', rabbit_types:amqqueue(), absent_reason()}). -spec(recover/0 :: () -> [rabbit_types:amqqueue()]). @@ -77,11 +79,9 @@ -> {'new' | 'existing' | 'owner_died', rabbit_types:amqqueue()} | {'absent', rabbit_types:amqqueue(), absent_reason()} | rabbit_types:channel_exit()). -%% TODO nonsense -spec(internal_declare/2 :: (rabbit_types:amqqueue(), boolean()) - -> {'new', rabbit_misc:thunk(rabbit_types:amqqueue())} | - {'absent', rabbit_types:amqqueue()}). + -> queue_or_absent() | rabbit_misc:thunk(queue_or_absent())). -spec(update/2 :: (name(), fun((rabbit_types:amqqueue()) -> rabbit_types:amqqueue())) diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index 9bccf5dd..1bea8042 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -24,7 +24,7 @@ needs_timeout/1, timeout/1, handle_pre_hibernate/1, resume/1, msg_rates/1, info/2, invoke/3, is_duplicate/2]). --export([start/1, stop/0]). +-export([start/1, stop/0, delete_crashed/1]). -export([promote_backing_queue_state/8, sender_death_fun/0, depth_fun/0]). @@ -90,6 +90,9 @@ stop() -> %% Same as start/1. exit({not_valid_for_generic_backing_queue, ?MODULE}). +delete_crashed(_QName) -> + exit({not_valid_for_generic_backing_queue, ?MODULE}). + init(Q, Recover, AsyncCallback) -> {ok, BQ} = application:get_env(backing_queue_module), BQS = BQ:init(Q, Recover, AsyncCallback), |