summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2011-03-04 08:34:11 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2011-03-04 08:34:11 +0000
commit976787bbbaf1ebbae5e7c620f8b8ae40f55afd71 (patch)
treece0fd68a36850366496d7b95fd436ae06f66ff46
parent2570ed2e55fb40e2853652a5e94719ddb2a9e78e (diff)
downloadrabbitmq-server-bug23875.tar.gz
cosmeticbug23875
-rw-r--r--src/rabbit_alarm.erl15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index 9f88d8da..d38ecb91 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -148,20 +148,19 @@ alert_remote(Alert, Alertees) -> alert(Alert, Alertees, fun erlang:'=/='/2).
alert(Alert, Alertees, NodeComparator) ->
Node = node(),
- dict:fold(fun (Pid, {M, F, A}, Acc) ->
+ dict:fold(fun (Pid, {M, F, A}, ok) ->
case NodeComparator(Node, node(Pid)) of
- true -> ok = erlang:apply(M, F, A ++ [Pid, Alert]),
- Acc;
- false -> Acc
+ true -> apply(M, F, A ++ [Pid, Alert]);
+ false -> ok
end
end, ok, Alertees).
internal_register(Pid, {M, F, A} = HighMemMFA,
State = #alarms{alertees = Alertees}) ->
_MRef = erlang:monitor(process, Pid),
- ok = case sets:is_element(node(), State#alarms.alarmed_nodes) of
- true -> apply(M, F, A ++ [Pid, true]);
- false -> ok
- end,
+ case sets:is_element(node(), State#alarms.alarmed_nodes) of
+ true -> ok = apply(M, F, A ++ [Pid, true]);
+ false -> ok
+ end,
NewAlertees = dict:store(Pid, HighMemMFA, Alertees),
State#alarms{alertees = NewAlertees}.