diff options
| -rw-r--r-- | ebin/rabbit.app | 4 | ||||
| -rw-r--r-- | src/rabbit_alarm.erl | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ebin/rabbit.app b/ebin/rabbit.app index 0d714fdf3d..5ecd247bb9 100644 --- a/ebin/rabbit.app +++ b/ebin/rabbit.app @@ -50,8 +50,8 @@ {applications, [kernel, stdlib, sasl, mnesia, os_mon]}, {mod, {rabbit, []}}, {env, [{tcp_listeners, [{"0.0.0.0", 5672}]}, - {extra_startup_steps, []}, + {extra_startup_steps, []}, {default_user, <<"guest">>}, {default_pass, <<"guest">>}, {default_vhost, <<"/">>}, - {memory_alarms, auto}]}]}. + {memory_alarms, auto}]}]}. diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl index dee71d23d5..875624ba55 100644 --- a/src/rabbit_alarm.erl +++ b/src/rabbit_alarm.erl @@ -53,7 +53,7 @@ -spec(start/1 :: (bool() | 'auto') -> 'ok'). -spec(stop/0 :: () -> 'ok'). -spec(register/2 :: (pid(), mfa_tuple()) -> 'ok'). - + -endif. %%---------------------------------------------------------------------------- @@ -101,7 +101,7 @@ handle_call({register, Pid, HighMemMFA}, end, NewAlertees = dict:store(Pid, HighMemMFA, Alertess), {ok, ok, State#alarms{alertees = NewAlertees}}; - + handle_call(_Request, State) -> {ok, not_understood, State}. @@ -135,7 +135,7 @@ code_change(_OldVsn, State, _Extra) -> %%---------------------------------------------------------------------------- start_memsup() -> - Mod = case os:type() of + Mod = case os:type() of %% memsup doesn't take account of buffers or cache when %% considering "free" memory - therefore on Linux we can %% get memory alarms very easily without any pressure @@ -143,7 +143,7 @@ start_memsup() -> %% our own simple memory monitor. %% {unix, linux} -> rabbit_memsup_linux; - + %% Start memsup programmatically rather than via the %% rabbitmq-server script. This is not quite the right %% thing to do as os_mon checks to see if memsup is |