diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 46f7d9d1f3..138693f584 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -235,6 +235,8 @@ status() -> {running_applications, application:which_applications()}, {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, + {vm_memory_high_watermark, + vm_memory_monitor:get_vm_memory_high_watermark()}, {memory, erlang:memory()}]. environment() -> diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index e8afed0c11..b386e3383a 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -324,6 +324,11 @@ action(trace_off, Node, [], Opts, Inform) -> Inform("Stopping tracing for vhost ~p", [VHost]), rpc_call(Node, rabbit_trace, stop, [list_to_binary(VHost)]); +action(set_vm_memory_high_watermark, Node, [Arg], _Opts, Inform) -> + Frac = list_to_float("0" ++ Arg), + Inform("Setting memory threshhold on ~p to ~p", [Node, Frac]), + rpc_call(Node, vm_memory_monitor, set_vm_memory_high_watermark, [Frac]); + action(set_permissions, Node, [Username, CPerm, WPerm, RPerm], Opts, Inform) -> VHost = proplists:get_value(?VHOST_OPT, Opts), Inform("Setting permissions for user ~p in vhost ~p", [Username, VHost]), |