diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-01-04 11:26:57 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-01-04 11:26:57 +0000 |
| commit | 024f3ea569c94a2b967644d5d51a0f2acf99d4d5 (patch) | |
| tree | 19dd0991c86990409ad86edba2db41127191c2d9 /scripts | |
| parent | 41360d7851b52b5fc51765792408afbe3467ef50 (diff) | |
| parent | 69957f6f24f98fb0ad264599b47ca6c71ebb38b8 (diff) | |
| download | rabbitmq-server-git-024f3ea569c94a2b967644d5d51a0f2acf99d4d5.tar.gz | |
merge default into v1_5_1
All the changes made on 'default' so far should go into v1_5_1. Which
is lucky since we don't have to cherry pick.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index bb65d64dd0..572262c97e 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -38,8 +38,8 @@ [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=0.0.0.0 [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=5672 -[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_ERL_ARGS=${SERVER_ERL_ARGS} -[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_ERL_ARGS="+K true +A30 \ +[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} +[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS="+K true +A30 \ -kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \ -kernel inet_default_connect_options [{nodelay,true}]" [ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE} |