summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-10-04 16:20:09 +0100
committerMatthias Radestock <matthias@lshift.net>2008-10-04 16:20:09 +0100
commitf3e3f768d20b302c5cf0dc186b2d603bfadb5787 (patch)
treefd725952109f4519a54ce7b2fc418c3148def5d4 /scripts
parent2a0374c97aad540dbf3800a3bdf1329253f9b992 (diff)
downloadrabbitmq-server-git-f3e3f768d20b302c5cf0dc186b2d603bfadb5787.tar.gz
beginnings of reacting to low memory conditions
configure memsup and hook in our own alarm handler
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-server3
-rw-r--r--scripts/rabbitmq-server.bat3
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index b930c8edd8..994736ceb5 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -66,8 +66,9 @@ erl \
-sasl sasl_error_logger '{file,"'${SASL_LOGS}'"}' \
-os_mon start_cpu_sup true \
-os_mon start_disksup false \
- -os_mon start_memsup false \
+ -os_mon start_memsup true \
-os_mon start_os_sup false \
+ -os_mon memsup_system_only true \
-mnesia dir "\"${MNESIA_DIR}\"" \
${CLUSTER_CONFIG} \
${RABBIT_ARGS} \
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index f08027d237..3ad093e0fc 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -107,8 +107,9 @@ set MNESIA_DIR=%MNESIA_BASE%/%NODENAME%-mnesia
-sasl sasl_error_logger {file,\""%LOG_BASE%/%NODENAME%-sasl.log"\"} ^
-os_mon start_cpu_sup true ^
-os_mon start_disksup false ^
--os_mon start_memsup false ^
+-os_mon start_memsup true ^
-os_mon start_os_sup false ^
+-os_mon memsup_system_only true ^
-mnesia dir \""%MNESIA_DIR%"\" ^
%CLUSTER_CONFIG% ^
%RABBIT_ARGS% ^