summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@lshift.net>2008-11-26 16:39:05 +0000
committerSimon MacMullen <simon@lshift.net>2008-11-26 16:39:05 +0000
commitd3a787deadd0c1c1cb5fec74757dac939d3ce494 (patch)
tree99f856d72d8dc8673332b0686c76577e7c219c83 /src
parent86f383ff74b57023214317060f494779d04270c1 (diff)
downloadrabbitmq-server-git-d3a787deadd0c1c1cb5fec74757dac939d3ce494.tar.gz
Matthias has pointed out the existence of whereis/1.
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_alarm.erl6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index 6c46d5d75f..1be0c6ab63 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -61,10 +61,8 @@ start() ->
rabbit:start_child(rabbit_linux_memory),
ok;
_ ->
- MemsupRunning = lists:any(fun ({Id, _, _, _}) -> Id == memsup end,
- supervisor:which_children(os_mon_sup)),
- case MemsupRunning of
- false ->
+ case whereis(memsup) of
+ undefined ->
%% Start memsup programmatically rather than via the rabbitmq-server
%% script. This is not quite the right thing to do as os_mon checks
%% to see if memsup is available before starting it, but as memsup