diff options
| author | Rob Harrop <rob@rabbitmq.com> | 2010-10-29 11:10:02 +0100 |
|---|---|---|
| committer | Rob Harrop <rob@rabbitmq.com> | 2010-10-29 11:10:02 +0100 |
| commit | 69c0bd83150bf5cb4ee5b50db6404495456e3288 (patch) | |
| tree | f8c91b85767ec8bbe9ad64cfb6231ad046d68ec2 /scripts/rabbitmq-server | |
| parent | bbae6be61035a47609beda767a27a1347a4aba38 (diff) | |
| parent | 0f90ff4daacbd6f53ea1da5323d73aaaa2ca0218 (diff) | |
| download | rabbitmq-server-git-69c0bd83150bf5cb4ee5b50db6404495456e3288.tar.gz | |
Merge from bug23422
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 8e26663a50..ef0a3521c1 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -35,7 +35,6 @@ NODENAME=rabbit@${HOSTNAME%%.*} 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 CONFIG_FILE=/etc/rabbitmq/rabbitmq LOG_BASE=/var/log/rabbitmq MNESIA_BASE=/var/lib/rabbitmq/mnesia @@ -59,7 +58,6 @@ else fi [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} [ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} -[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE} [ "x" = "x$RABBITMQ_CONFIG_FILE" ] && RABBITMQ_CONFIG_FILE=${CONFIG_FILE} [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE} [ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE} |