diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-07-18 12:41:02 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-07-18 12:41:02 +0100 |
| commit | 4390c4e4b3bd5c3f29300417865774a9a2c8b409 (patch) | |
| tree | c9f621e4d829b1e1db0f2f29ef2fc16cb8d5da65 | |
| parent | b30b8382116f5e2643cc1375b8b4393edeaa73fe (diff) | |
| download | rabbitmq-server-bug24998.tar.gz | |
Minor simplificationbug24998
| -rw-r--r-- | src/file_handle_cache.erl | 4 | ||||
| -rw-r--r-- | src/vm_memory_monitor.erl | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl index 9a49cc6a..b2a036b5 100644 --- a/src/file_handle_cache.erl +++ b/src/file_handle_cache.erl @@ -270,7 +270,7 @@ %%---------------------------------------------------------------------------- start_link() -> - gen_server2:start_link({local, ?SERVER}, ?MODULE, [], [{timeout, infinity}]). + start_link(fun alarm_handler:set_alarm/1, fun alarm_handler:clear_alarm/1). start_link(AlarmSet, AlarmClear) -> gen_server2:start_link({local, ?SERVER}, ?MODULE, [AlarmSet, AlarmClear], @@ -812,8 +812,6 @@ i(Item, _) -> throw({bad_argument, Item}). %% gen_server2 callbacks %%---------------------------------------------------------------------------- -init([]) -> - init([fun alarm_handler:set_alarm/1, fun alarm_handler:clear_alarm/1]); init([AlarmSet, AlarmClear]) -> Limit = case application:get_env(file_handles_high_watermark) of {ok, Watermark} when (is_integer(Watermark) andalso diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index 535208af..df5f73e7 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -104,15 +104,13 @@ get_memory_limit() -> %%---------------------------------------------------------------------------- start_link(MemFraction) -> - gen_server:start_link({local, ?SERVER}, ?MODULE, [MemFraction], []). + start_link(MemFraction, + fun alarm_handler:set_alarm/1, fun alarm_handler:clear_alarm/1). start_link(MemFraction, AlarmSet, AlarmClear) -> gen_server:start_link({local, ?SERVER}, ?MODULE, [MemFraction, AlarmSet, AlarmClear], []). -init([MemFraction]) -> - init([MemFraction, fun alarm_handler:set_alarm/1, - fun alarm_handler:clear_alarm/1]); init([MemFraction, AlarmSet, AlarmClear]) -> TRef = start_timer(?DEFAULT_MEMORY_CHECK_INTERVAL), State = #state { timeout = ?DEFAULT_MEMORY_CHECK_INTERVAL, |