diff options
| -rw-r--r-- | src/rabbit_vm.erl | 12 | ||||
| -rw-r--r-- | src/vm_memory_monitor.erl | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index f11dedd43d..e56516b05b 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -44,12 +44,12 @@ memory() -> MsgIndexETS = ets_memory([msg_store_persistent, msg_store_transient]), MetricsETS = ets_memory([rabbit_metrics]), MetricsProc = try - [{_, M}] = process_info(whereis(rabbit_metrics), [memory]), - M - catch - error:badarg -> - 0 - end, + [{_, M}] = process_info(whereis(rabbit_metrics), [memory]), + M + catch + error:badarg -> + 0 + end, MgmtDbETS = ets_memory([rabbit_mgmt_storage]), OsTotal = vm_memory_monitor:get_process_memory(), diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index f6d6c85793..f21dc91e0a 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -242,7 +242,7 @@ init([MemFraction, AlarmFuns]) -> {ok, set_mem_limits(State, MemFraction)}. handle_call(get_vm_memory_high_watermark, _From, - #state{memory_config_limit = MemLimit} = State) -> + #state{memory_config_limit = MemLimit} = State) -> {reply, MemLimit, State}; handle_call({set_vm_memory_high_watermark, MemLimit}, _From, State) -> @@ -458,7 +458,6 @@ get_total_memory({unix, aix}) -> get_total_memory(_OsType) -> unknown. - %% A line looks like "Foo bar: 123456." parse_line_mach(Line) -> [Name, RHS | _Rest] = string:tokens(Line, ":"), |