summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-09-05 10:27:28 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-09-05 10:27:28 +0100
commit6578389b1df1937fb08bb7a1621b50f09cb7416e (patch)
treecae7386e0ae8b93d36fcebbe4f883dd9048b4fe0
parent4d81ce03d196bf97ce3fda8969095e00e895d6ee (diff)
downloadrabbitmq-server-6578389b1df1937fb08bb7a1621b50f09cb7416e.tar.gz
Add specs, remove misleading "%% temp" comment.
-rw-r--r--src/rabbit_amqqueue.erl4
-rw-r--r--src/rabbit_mirror_queue_master.erl4
-rw-r--r--src/rabbit_mirror_queue_misc.erl16
3 files changed, 15 insertions, 9 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 96cf226e..65d3001a 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -29,8 +29,6 @@
-export([notify_down_all/2, limit_all/3]).
-export([on_node_down/1]).
-export([update/2, store_queue/1, policy_changed/2]).
-
-%% temp
-export([start_mirroring/1, stop_mirroring/1]).
%% internal
@@ -165,6 +163,8 @@
-spec(store_queue/1 :: (rabbit_types:amqqueue()) -> 'ok').
-spec(policy_changed/2 ::
(rabbit_types:amqqueue(), rabbit_types:amqqueue()) -> 'ok').
+-spec(start_mirroring/1 :: (pid()) -> 'ok').
+-spec(stop_mirroring/1 :: (pid()) -> 'ok').
-endif.
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl
index 9f2305ba..e35b0808 100644
--- a/src/rabbit_mirror_queue_master.erl
+++ b/src/rabbit_mirror_queue_master.erl
@@ -27,7 +27,6 @@
-export([promote_backing_queue_state/6, sender_death_fun/0, length_fun/0]).
-%% temp
-export([init_with_existing_bq/3, stop_mirroring/1]).
-behaviour(rabbit_backing_queue).
@@ -66,6 +65,9 @@
(pid(), atom(), any(), pid(), dict(), [pid()]) -> master_state()).
-spec(sender_death_fun/0 :: () -> death_fun()).
-spec(length_fun/0 :: () -> length_fun()).
+-spec(init_with_existing_bq/3 :: (rabbit_types:amqqueue(), atom(), any()) ->
+ master_state()).
+-spec(stop_mirroring/1 :: (master_state()) -> {atom(), any()}).
-endif.
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl
index 7caa96b5..5ad04ff7 100644
--- a/src/rabbit_mirror_queue_misc.erl
+++ b/src/rabbit_mirror_queue_misc.erl
@@ -18,14 +18,12 @@
-export([remove_from_queue/2, on_node_up/0,
drop_mirror/2, drop_mirror/3, add_mirror/2, add_mirror/3,
- report_deaths/4, store_updated_slaves/1]).
+ report_deaths/4, store_updated_slaves/1, suggested_queue_nodes/1,
+ is_mirrored/1, update_mirrors/2]).
-%% temp
--export([suggested_queue_nodes/1, is_mirrored/1, update_mirrors/2]).
-%% for testing
+%% for testing only
-export([suggested_queue_nodes/4]).
-
-include("rabbit.hrl").
%%----------------------------------------------------------------------------
@@ -45,6 +43,11 @@
-> rabbit_types:ok_or_error(any())).
-spec(store_updated_slaves/1 :: (rabbit_types:amqqueue()) ->
rabbit_types:amqqueue()).
+-spec(suggested_queue_nodes/1 :: (rabbit_types:amqqueue()) ->
+ {node(), [node()]}).
+-spec(is_mirrored/1 :: (rabbit_types:amqqueue()) -> boolean()).
+-spec(update_mirrors/2 ::
+ (rabbit_types:amqqueue(), rabbit_types:amqqueue()) -> 'ok').
-endif.
@@ -286,5 +289,6 @@ update_mirrors(OldQ = #amqqueue{name = QName, pid = QPid},
Add = NewNodes -- OldNodes,
Remove = OldNodes -- NewNodes,
[ok = drop_mirror(QName, Node) || Node <- Remove],
- [ok = add_mirror(QName, Node) || Node <- Add]
+ [ok = add_mirror(QName, Node) || Node <- Add],
+ ok
end.