diff options
| author | Essien Ita Essien <essiene@gmail.com> | 2008-12-26 10:29:00 +0100 |
|---|---|---|
| committer | Essien Ita Essien <essiene@gmail.com> | 2008-12-26 10:29:00 +0100 |
| commit | a625e7695d9af4083a137821e52bd3afa09c85c2 (patch) | |
| tree | 11f0aaae33fa1335f1b986f76757b6733d64fe91 /scripts | |
| parent | 9e4fdee06474001eecfd58cce1ceea7e49fde9b3 (diff) | |
| parent | 4be2257979970f5b697d1e4402ca0bd6bd3ae691 (diff) | |
| download | rabbitmq-server-git-a625e7695d9af4083a137821e52bd3afa09c85c2.tar.gz | |
Merge in upstream changes
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-mnesia-current | 63 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 4 |
2 files changed, 2 insertions, 65 deletions
diff --git a/scripts/rabbitmq-mnesia-current b/scripts/rabbitmq-mnesia-current deleted file mode 100755 index e7e1118cf4..0000000000 --- a/scripts/rabbitmq-mnesia-current +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -## The contents of this file are subject to the Mozilla Public License -## Version 1.1 (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://www.mozilla.org/MPL/ -## -## Software distributed under the License is distributed on an "AS IS" -## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the -## License for the specific language governing rights and limitations -## under the License. -## -## The Original Code is RabbitMQ. -## -## The Initial Developers of the Original Code are LShift Ltd, -## Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd. -## -## Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd, -## Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd -## are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial -## Technologies LLC, and Rabbit Technologies Ltd. -## -## Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift -## Ltd. Portions created by Cohesive Financial Technologies LLC are -## Copyright (C) 2007-2009 Cohesive Financial Technologies -## LLC. Portions created by Rabbit Technologies Ltd are Copyright -## (C) 2007-2009 Rabbit Technologies Ltd. -## -## All Rights Reserved. -## -## Contributor(s): ______________________________________. -## - -[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq - -[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE} -[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME} -[ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit -[ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=${NODE_IP_ADDRESS} -[ "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_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE} -[ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=/var/log/rabbitmq -[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE} -[ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=/var/lib/rabbitmq/mnesia -[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${MNESIA_DIR} -[ "x" = "x$RABBITMQ_MNESIA_DIR" ] && RABBITMQ_MNESIA_DIR=${RABBITMQ_MNESIA_BASE}/${RABBITMQ_NODENAME} - -if [ -f "$RABBITMQ_CLUSTER_CONFIG_FILE" ]; then - RABBITMQ_CLUSTER_CONFIG_OPTION="-rabbit cluster_config \"$RABBITMQ_CLUSTER_CONFIG_FILE\"" -else - RABBITMQ_CLUSTER_CONFIG_OPTION="" -fi - -exec erl \ - -pa "`dirname $0`/../ebin" \ - -noshell \ - -sname ${RABBITMQ_NODENAME} \ - -eval 'halt(case rabbit_mnesia:schema_current() of true -> 0; false -> 1 end).' \ - -mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \ - -kernel error_logger '{file,"'/dev/null'"}' \ - ${RABBITMQ_CLUSTER_CONFIG_OPTION} diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index f9678258c4..403b6e801d 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -42,8 +42,8 @@ [ "x" = "x$RABBITMQ_SSL_IP_ADDRESS" ] && RABBITMQ_SSL_IP_ADDRESS=0.0.0.0 [ "x" = "x$RABBITMQ_SSL_PORT" ] && RABBITMQ_SSL_PORT=${SSL_PORT} [ "x" = "x$RABBITMQ_SSL_PORT" ] && RABBITMQ_SSL_PORT=5673 -[ "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} |