summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jones <paulj@lshift.net>2009-07-22 16:17:32 +0100
committerPaul Jones <paulj@lshift.net>2009-07-22 16:17:32 +0100
commit3bd0ea09764ec0f5d029ff7eff48506168819674 (patch)
tree93d0ca1bebb67ff4bfcdef9d10216613c4d2466f
parent31e0c44c728751a00195785979e24898a238ed35 (diff)
downloadrabbitmq-server-3bd0ea09764ec0f5d029ff7eff48506168819674.tar.gz
Updates to rabbitmq-server script to eliminate warnings about hidden files; ignoring generated directories
-rw-r--r--.hgignore1
-rwxr-xr-xscripts/rabbitmq-server6
2 files changed, 5 insertions, 2 deletions
diff --git a/.hgignore b/.hgignore
index 7925f07a..3323e2fc 100644
--- a/.hgignore
+++ b/.hgignore
@@ -14,6 +14,7 @@ syntax: regexp
^ebin/rabbit.boot$
^ebin/rabbit.script$
^plugins/
+^priv/plugins/
^packaging/RPMS/Fedora/(BUILD|RPMS|SOURCES|SPECS|SRPMS)$
^packaging/debs/Debian/rabbitmq-server_.*\.(dsc|(diff|tar)\.gz|deb|changes)$
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 40d66411..569f54d9 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -77,8 +77,10 @@ RABBITMQ_START_RABBIT=
if [ -f "`dirname $0`/../ebin/rabbit.boot" ]; then
RABBITMQ_BOOT_FILE="`dirname $0`/../ebin/rabbit"
+ RABBITMQ_EBIN_PATH=""
else
RABBITMQ_BOOT_FILE=start_sasl
+ RABBITMQ_EBIN_PATH="-pa `dirname $0`/../ebin"
fi
# we need to turn off path expansion because some of the vars, notably
@@ -87,10 +89,10 @@ fi
set -f
exec erl \
- -pa "`dirname $0`/../ebin" \
+ ${RABBITMQ_EBIN_PATH} \
${RABBITMQ_START_RABBIT} \
-sname ${RABBITMQ_NODENAME} \
- -boot $RABBITMQ_BOOT_FILE \
+ -boot ${RABBITMQ_BOOT_FILE} \
+W w \
${RABBITMQ_SERVER_ERL_ARGS} \
-rabbit tcp_listeners '[{"'${RABBITMQ_NODE_IP_ADDRESS}'", '${RABBITMQ_NODE_PORT}'}]' \