summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2011-08-26 17:45:16 +0100
committerEmile Joubert <emile@rabbitmq.com>2011-08-26 17:45:16 +0100
commit3607125be153616b1b98a0fe1a55018d9681877d (patch)
tree2f9a33e1630e4b31f15eb504f65ed6f606ff3df2 /src
parentfbe1be958a0d034c139af0d8839d3f2149ac25cc (diff)
downloadrabbitmq-server-git-3607125be153616b1b98a0fe1a55018d9681877d.tar.gz
Move docs for rabbitmqctl set_vm_memory_high_watermark
and only modify state when necessary
Diffstat (limited to 'src')
-rw-r--r--src/vm_memory_monitor.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 40fb7239bf..3b95591488 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -118,10 +118,9 @@ handle_call(get_vm_memory_high_watermark, _From, State) ->
handle_call({set_vm_memory_high_watermark, MemFraction}, _From, State) ->
State1 = set_mem_limits(State, MemFraction),
- MemLimit = get_mem_limit(MemFraction, State1#state.total_memory),
error_logger:info_msg("Memory alarm changed to ~p, ~p bytes.~n",
- [MemFraction, MemLimit]),
- {reply, ok, State1#state{memory_limit = MemLimit}};
+ [MemFraction, State1#state.memory_limit]),
+ {reply, ok, State1};
handle_call(get_check_interval, _From, State) ->
{reply, State#state.timeout, State};