diff options
| -rw-r--r-- | docs/rabbitmq.config.example | 1 | ||||
| -rw-r--r-- | src/rabbit_alarm.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index d555507e31..eb97f1e519 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -227,6 +227,7 @@ %% Or you can set it using memory units (same as in vm_memory_high_watermark) %% {disk_free_limit, "50MB"}, %% {disk_free_limit, "50000kB"}, + %% {disk_free_limit, "2GB"}, %% Alternatively, we can set a limit relative to total available RAM. %% diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index 09d67516fd..6ca0502294 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -101,7 +101,7 @@ parse_mem_limit({absolute, Limit}) -> case parse_limit(Limit) of {ok, ParsedLimit} -> {absolute, ParsedLimit}; {error, parse_error} -> - rabbit_log:error("Unable to parse vm_memory_high_watermark value"), + rabbit_log:error("Unable to parse vm_memory_high_watermark value ~p", [Limit]), ?DEFAULT_VM_MEMORY_HIGH_WATERMARK end; {absolute, parse_limit(Limit, ?DEFAULT_VM_MEMORY_HIGH_WATERMARK)}; @@ -117,7 +117,7 @@ parse_disk_limit(Limit) -> case parse_limit(Limit) of {ok, ParsedLimit} -> ParsedLimit; {error, parse_error} -> - rabbit_log:error("Unable to parse disk_free_limit value"), + rabbit_log:error("Unable to parse disk_free_limit value ~p", [Limit]), ?DEFAULT_DISK_FREE_LIMIT end; parse_disk_limit(_) -> ?DEFAULT_DISK_FREE_LIMIT. diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 426520c31d..6f2c9fd702 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -423,7 +423,7 @@ action(set_vm_memory_high_watermark, Node, ["absolute", Arg], _Opts, Inform) -> rpc_call(Node, vm_memory_monitor, set_vm_memory_high_watermark, [{absolute, Limit}]); {error, parse_error} -> - {error_string, "Unable to parse absolute memory value"} + {error_string, "Unable to parse absolute memory limit value ~p", [Arg]} end; action(set_permissions, Node, [Username, CPerm, WPerm, RPerm], Opts, Inform) -> |