diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2013-07-30 13:23:49 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2013-07-30 13:23:49 +0100 |
commit | 41e6279f391681058f7bed93d6f451636dac3de0 (patch) | |
tree | 94bfb7b0853d6d522de91194a3ebaed58bbace98 | |
parent | ca0662bf60a110b7144edb66f13ea588ba4bbb52 (diff) | |
download | rabbitmq-server-41e6279f391681058f7bed93d6f451636dac3de0.tar.gz |
Inlining and cosmetic.
-rw-r--r-- | src/rabbit_alarm.erl | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index 063e98aa..c8747c9a 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -104,24 +104,18 @@ handle_call(_Request, State) -> {ok, not_understood, State}. handle_event({set_alarm, Alarm}, State = #alarms{alarms = Alarms}) -> - IsDuplicate = lists:member(Alarm, Alarms), - case IsDuplicate of - true -> - {ok, State}; - false -> - UpdatedAlarms = lists:usort([Alarm|Alarms]), - handle_set_alarm(Alarm, State#alarms{alarms = UpdatedAlarms}) + case lists:member(Alarm, Alarms) of + true -> {ok, State}; + false -> UpdatedAlarms = lists:usort([Alarm|Alarms]), + handle_set_alarm(Alarm, State#alarms{alarms = UpdatedAlarms}) end; handle_event({clear_alarm, Alarm}, State = #alarms{alarms = Alarms}) -> - ExistingAlarm = lists:keymember(Alarm, 1, Alarms), - case ExistingAlarm of - true -> - handle_clear_alarm(Alarm, - State#alarms{alarms = lists:keydelete(Alarm, 1, - Alarms)}); - false -> - {ok, State} + case lists:keymember(Alarm, 1, Alarms) of + true -> handle_clear_alarm( + Alarm, State#alarms{alarms = lists:keydelete( + Alarm, 1, Alarms)}); + false -> {ok, State} end; @@ -192,10 +186,8 @@ maybe_alert(UpdateFun, Node, Source, Event, ok end, case Event of - clear -> - ok = alert_local(false, Alertees, Source); - set -> - ok = alert_local(true, Alertees, Source) + clear -> ok = alert_local(false, Alertees, Source); + set -> ok = alert_local(true, Alertees, Source) end, State#alarms{alarmed_nodes = AN1}. |