diff options
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 2 | ||||
| -rwxr-xr-x | scripts/rabbitmq-service.bat | 2 | ||||
| -rw-r--r-- | src/rabbit.erl | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 1eefd702..08ceb27d 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -109,7 +109,7 @@ exec erl \ -os_mon start_cpu_sup true \ -os_mon start_disksup false \ -os_mon start_memsup false \ - -os_mon system_memory_high_watermark 0.7 \ + -os_mon vm_memory_high_watermark 0.7 \ -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 977036d0..6346c5d9 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -137,7 +137,7 @@ if exist "%RABBITMQ_CONFIG_FILE%.config" ( -os_mon start_cpu_sup true ^
-os_mon start_disksup false ^
-os_mon start_memsup false ^
--os_mon system_memory_high_watermark 0.7 ^
+-os_mon vm_memory_high_watermark 0.7 ^
-mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^
%CLUSTER_CONFIG% ^
%RABBITMQ_SERVER_START_ARGS% ^
diff --git a/scripts/rabbitmq-service.bat b/scripts/rabbitmq-service.bat index 09c5993e..1e7e99f7 100755 --- a/scripts/rabbitmq-service.bat +++ b/scripts/rabbitmq-service.bat @@ -173,7 +173,7 @@ set ERLANG_SERVICE_ARGUMENTS= ^ -os_mon start_cpu_sup true ^
-os_mon start_disksup false ^
-os_mon start_memsup false ^
--os_mon system_memory_high_watermark 0.7 ^
+-os_mon vm_memory_high_watermark 0.7 ^
-mnesia dir \""%RABBITMQ_MNESIA_DIR%"\" ^
%CLUSTER_CONFIG% ^
%RABBITMQ_SERVER_START_ARGS% ^
diff --git a/src/rabbit.erl b/src/rabbit.erl index eee7d229..2e9e6e7d 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -142,14 +142,14 @@ start(normal, []) -> ok = rabbit_alarm:start(), MemoryWatermark = - application:get_env(os_mon, system_memory_high_watermark), + application:get_env(os_mon, vm_memory_high_watermark), ok = case MemoryWatermark of {ok, false} -> ok; {ok, Float} when Float == 0 -> ok; {ok, Float} -> start_child(vm_memory_monitor, [Float]); undefined -> throw({undefined, os_mon, - system_memory_high_watermark, settings}) + vm_memory_high_watermark, settings}) end, ok = rabbit_amqqueue:start(), |