diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-11-16 11:57:41 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-11-16 11:57:41 +0000 |
| commit | 39eb3747e436db89ca98ecf27bf4f21d1cd798f3 (patch) | |
| tree | 3f7da44966b7a16f138c3a910c8c920b02653e00 | |
| parent | b262cff8f621ef744e129a9290fa4a7e1562b64c (diff) | |
| download | rabbitmq-server-bug21975.tar.gz | |
all donebug21975
| -rw-r--r-- | ebin/rabbit_app.in | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 1 | ||||
| -rwxr-xr-x | scripts/rabbitmq-service.bat | 1 | ||||
| -rw-r--r-- | src/rabbit.erl | 18 |
5 files changed, 10 insertions, 12 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index 39f98cbe..3616fcbf 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -17,6 +17,7 @@ {env, [{tcp_listeners, [{"0.0.0.0", 5672}]}, {ssl_listeners, []}, {ssl_options, []}, + {vm_memory_high_watermark, 0.4}, {default_user, <<"guest">>}, {default_pass, <<"guest">>}, {default_vhost, <<"/">>}, diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 34904850..310afe94 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -109,7 +109,6 @@ exec erl \ -os_mon start_cpu_sup true \ -os_mon start_disksup false \ -os_mon start_memsup false \ - -os_mon vm_memory_high_watermark 0.4 \ -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ ${RABBITMQ_CLUSTER_CONFIG_OPTION} \ ${RABBITMQ_SERVER_START_ARGS} \ diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index 5b82ec15..211fc781 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -140,7 +140,6 @@ if exist "%RABBITMQ_CONFIG_FILE%.config" ( -os_mon start_cpu_sup true ^
-os_mon start_disksup false ^
-os_mon start_memsup false ^
--os_mon vm_memory_high_watermark 0.4 ^
-mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^
%CLUSTER_CONFIG% ^
%RABBITMQ_SERVER_START_ARGS% ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 26bdc1e6..d80df967 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -196,7 +196,6 @@ set ERLANG_SERVICE_ARGUMENTS= ^ -os_mon start_cpu_sup true ^
-os_mon start_disksup false ^
-os_mon start_memsup false ^
--os_mon vm_memory_high_watermark 0.4 ^
-mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^
%CLUSTER_CONFIG% ^
%RABBITMQ_SERVER_START_ARGS% ^
diff --git a/src/rabbit.erl b/src/rabbit.erl index 29407e4e..c6dde385 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -141,16 +141,16 @@ start(normal, []) -> check_empty_content_body_frame_size(), ok = rabbit_alarm:start(), - MemoryWatermark = - application:get_env(os_mon, vm_memory_high_watermark), - ok = case MemoryWatermark of - {ok, Float} when Float == 0 -> ok; - {ok, Float} -> start_child(vm_memory_monitor, [Float]); - undefined -> - throw({undefined, os_mon, - vm_memory_high_watermark, settings}) + + {ok, MemoryWatermark} = + application:get_env(vm_memory_high_watermark), + ok = case MemoryWatermark == 0 of + true -> + ok; + false -> + start_child(vm_memory_monitor, [MemoryWatermark]) end, - + ok = rabbit_amqqueue:start(), ok = start_child(rabbit_router), |