diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-07-30 16:17:39 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-07-30 16:17:39 +0100 |
| commit | dd999bfef9b58a5b80624beab56ab8fa20b3dcfb (patch) | |
| tree | a46bfe3d538873a82a4ffd3da991079be72582c9 /scripts/rabbitmq-server | |
| parent | a4d03b70db850684671068ccc82a21e959645646 (diff) | |
| parent | 44b0742a979a4fed2780fa876bc56dea1d58dffd (diff) | |
| download | rabbitmq-server-git-dd999bfef9b58a5b80624beab56ab8fa20b3dcfb.tar.gz | |
Merge default into amqp_0_9_1
Diffstat (limited to 'scripts/rabbitmq-server')
| -rwxr-xr-x | scripts/rabbitmq-server | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 2261b56ef5..7283f0e8f8 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -79,12 +79,6 @@ fi [ -f "${RABBITMQ_LOGS}" ] && cat "${RABBITMQ_LOGS}" >> "${RABBITMQ_LOGS}${RABBITMQ_BACKUP_EXTENSION}" [ -f "${RABBITMQ_SASL_LOGS}" ] && cat "${RABBITMQ_SASL_LOGS}" >> "${RABBITMQ_SASL_LOGS}${RABBITMQ_BACKUP_EXTENSION}" -if [ -f "$RABBITMQ_CLUSTER_CONFIG_FILE" ]; then - RABBITMQ_CLUSTER_CONFIG_OPTION="-rabbit cluster_config \"$RABBITMQ_CLUSTER_CONFIG_FILE\"" -else - RABBITMQ_CLUSTER_CONFIG_OPTION="" -fi - RABBITMQ_START_RABBIT= [ "x" = "x$RABBITMQ_ALLOW_INPUT" ] && RABBITMQ_START_RABBIT='-noinput' @@ -124,6 +118,5 @@ exec erl \ -os_mon start_disksup false \ -os_mon start_memsup false \ -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ - ${RABBITMQ_CLUSTER_CONFIG_OPTION} \ ${RABBITMQ_SERVER_START_ARGS} \ "$@" |