diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-06-22 12:51:02 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-06-22 12:51:02 +0100 |
| commit | 8b558751b966b3e9cf7077bac999862de379f7d8 (patch) | |
| tree | 1ab0a5e3e88f055f70f024076b24328786d55db1 /src | |
| parent | ce5ae4dc0d7857eb8748b847c90724bfb7ac7abb (diff) | |
| download | rabbitmq-server-git-8b558751b966b3e9cf7077bac999862de379f7d8.tar.gz | |
These two fixes were done in 20980 but should really be in this branch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_queue_mode_manager.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 586c06c0c6..9c1553b874 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -284,7 +284,7 @@ action(reduce_memory_footprint, Node, _Args, Inform) -> call(Node, {rabbit_queue_mode_manager, reduce_memory_footprint, []}); action(increase_memory_footprint, Node, _Args, Inform) -> - Inform("Reducing memory footprint", []), + Inform("Increasing memory footprint", []), call(Node, {rabbit_queue_mode_manager, increase_memory_footprint, []}); action(Command, Node, Args, Inform) -> diff --git a/src/rabbit_queue_mode_manager.erl b/src/rabbit_queue_mode_manager.erl index b36bb8bef2..040c9a1884 100644 --- a/src/rabbit_queue_mode_manager.erl +++ b/src/rabbit_queue_mode_manager.erl @@ -86,8 +86,8 @@ init([]) -> handle_call({register, Pid}, _From, State = #state { queues = Qs, mode = Mode }) -> Result = case Mode of - unlimited -> mixed; - _ -> disk + disk_only -> disk; + _ -> mixed end, {reply, {ok, Result}, State #state { queues = [Pid | Qs] }}. |