summaryrefslogtreecommitdiff
path: root/scripts/rabbitmq-env
diff options
context:
space:
mode:
authorSteve Powell <steve@rabbitmq.com>2012-02-28 10:56:15 +0000
committerSteve Powell <steve@rabbitmq.com>2012-02-28 10:56:15 +0000
commit2bbd4c6060944433ebe4ca87d2823e9cce1147ac (patch)
treecb2fecf8bc8eab80b80eed46b885f213a9ed5678 /scripts/rabbitmq-env
parentb35c92000e9e26429312c9a2b0209dd34b3761d6 (diff)
downloadrabbitmq-server-git-2bbd4c6060944433ebe4ca87d2823e9cce1147ac.tar.gz
Move SERVER_ERL_ARGS to rabbitmq-env and renamed rabbitmq-sys-defaults to rabbitmq-defaults
Diffstat (limited to 'scripts/rabbitmq-env')
-rwxr-xr-xscripts/rabbitmq-env8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 80e34e813a..197671380c 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -36,8 +36,12 @@ RABBITMQ_HOME="${SCRIPT_DIR}/.."
[ "x" = "x$HOSTNAME" ] && HOSTNAME=`env hostname`
NODENAME=rabbit@${HOSTNAME%%.*}
-## Get system defaults
-. ${SCRIPT_DIR}/rabbitmq-sys-defaults
+## Set defaults
+. ${SCRIPT_DIR}/rabbitmq-defaults
+
+## Common defaults
+SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
+ -kernel inet_default_connect_options [{nodelay,true}]"
# warn about old rabbitmq.conf file, if no new one
if [ -f /etc/rabbitmq/rabbitmq.conf ] && \