summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2010-04-30 15:24:52 +0100
committerMatthias Radestock <matthias@lshift.net>2010-04-30 15:24:52 +0100
commitc925bba84ec637b82f0180e9234d1e12c19fc364 (patch)
treec62fa121d876a6e3e35d01e4cd94e8b42010c20b /scripts
parent4eeddb1baa2972febb90af36e2a1f6a92b981b46 (diff)
parent86ab54a9e59139a42f927ad3480d11e520dd7dd4 (diff)
downloadrabbitmq-server-git-c925bba84ec637b82f0180e9234d1e12c19fc364.tar.gz
merge default into bug22616
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/rabbitmq-server2
-rw-r--r--scripts/rabbitmq-server.bat1
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 638498c1e2..ccdfc40160 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -31,7 +31,7 @@
##
NODENAME=rabbit
-SERVER_ERL_ARGS="+K true +A30 \
+SERVER_ERL_ARGS="+K true +A30 +P 1048576 \
-kernel inet_default_listen_options [{nodelay,true}] \
-kernel inet_default_connect_options [{nodelay,true}]"
CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config
diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat
index 28eb8ebb8d..57fe1328ce 100644
--- a/scripts/rabbitmq-server.bat
+++ b/scripts/rabbitmq-server.bat
@@ -145,6 +145,7 @@ if not "!RABBITMQ_NODE_IP_ADDRESS!"=="" (
-s rabbit ^
+W w ^
+A30 ^
++P 1048576 ^
-kernel inet_default_listen_options "[{nodelay, true}]" ^
-kernel inet_default_connect_options "[{nodelay, true}]" ^
!RABBITMQ_LISTEN_ARG! ^