diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-01-28 17:37:48 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-01-28 17:37:48 +0000 |
| commit | 1a186a89b27226857928d09a941e2e3b3338af94 (patch) | |
| tree | 89bc12839e512863013ebdc98bd120886e101c1a | |
| parent | 45f7849be58f78a23e28061fcace8bfdbdaa1e9a (diff) | |
| parent | fdc1dff9f272fff9a1b65cb668bd3fce49fe3bc1 (diff) | |
| download | rabbitmq-server-1a186a89b27226857928d09a941e2e3b3338af94.tar.gz | |
stable to default
| -rw-r--r-- | src/rabbit_mnesia.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index f295c47c..f22ee842 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -41,10 +41,7 @@ ]). %% Used internally in rpc calls --export([node_info/0, - remove_node_if_mnesia_running/1, - is_running_remote/0 - ]). +-export([node_info/0, remove_node_if_mnesia_running/1]). -include("rabbit.hrl"). @@ -336,7 +333,7 @@ status() -> IfNonEmpty(ram, cluster_nodes(ram)))}] ++ case mnesia:system_info(is_running) of yes -> RunningNodes = cluster_nodes(running), - [{running_nodes, cluster_nodes(running)}, + [{running_nodes, RunningNodes}, {partitions, mnesia_partitions(RunningNodes)}]; no -> [] end. @@ -732,8 +729,6 @@ change_extra_db_nodes(ClusterNodes0, CheckOtherNodes) -> Nodes end. -is_running_remote() -> {mnesia:system_info(is_running) =:= yes, node()}. - check_consistency(OTP, Rabbit) -> rabbit_misc:sequence_error( [check_otp_consistency(OTP), check_rabbit_consistency(Rabbit)]). diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index ec267a32..18cab48b 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -830,7 +830,8 @@ status(#vqstate { {avg_ack_ingress_rate, AvgAckIngressRate}, {avg_ack_egress_rate , AvgAckEgressRate} ]. -invoke(?MODULE, Fun, State) -> Fun(?MODULE, State). +invoke(?MODULE, Fun, State) -> Fun(?MODULE, State); +invoke( _, _, State) -> State. is_duplicate(_Msg, State) -> {false, State}. |