diff options
| author | Simon MacMullen <simon@lshift.net> | 2008-11-25 16:38:06 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@lshift.net> | 2008-11-25 16:38:06 +0000 |
| commit | 58f664667626e3bc90280aa12e5342aa246308b9 (patch) | |
| tree | 9b1772d1fa691a73c3d8b6a23c5c7013d711d832 | |
| parent | c0712a1c9efc55f138ebe60abe7efefa6f038455 (diff) | |
| download | rabbitmq-server-58f664667626e3bc90280aa12e5342aa246308b9.tar.gz | |
Merge default (effectively undoing bug19790...)
| -rw-r--r-- | src/rabbit_alarm.erl | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index bb2e3866..9a86d1c5 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -94,9 +94,7 @@ register(Pid, HighMemMFA) -> %%---------------------------------------------------------------------------- init([]) -> - HWM = system_memory_high_watermark(), - {ok, #alarms{alertees = dict:new(), - system_memory_high_watermark = HWM}}. + {ok, #alarms{alertees = dict:new()}}. handle_call({register, Pid, HighMemMFA}, State = #alarms{alertees = Alertess}) -> @@ -138,19 +136,6 @@ code_change(_OldVsn, State, _Extra) -> %%---------------------------------------------------------------------------- -system_memory_high_watermark() -> - %% When we register our alarm_handler, the - %% system_memory_high_watermark alarm may already have gone - %% off. How do we find out about that? Calling - %% alarm_handler:get_alarms() would deadlock. So instead we ask - %% memsup. Unfortunately that doesn't expose a suitable API, so we - %% have to reach quite deeply into its internals. - {dictionary, D} = process_info(whereis(memsup), dictionary), - case lists:keysearch(system_memory_high_watermark, 1, D) of - {value, {_, set}} -> true; - _Other -> false - end. - alert(Alert, Alertees) -> dict:fold(fun (Pid, {M, F, A}, Acc) -> ok = erlang:apply(M, F, A ++ [Pid, Alert]), |