25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00

Update NODE and HOST with the definitive values from ejabberdctl or command line

This commit is contained in:
Badlop 2011-01-17 17:28:12 +01:00
parent 722fdd6bc7
commit 9bb4f124ad

View File

@ -77,6 +77,8 @@ fi
NAME=-name NAME=-name
[ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && NAME=-sname [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && NAME=-sname
NODE=${ERLANG_NODE%@*}
HOST=${ERLANG_NODE#*@}
KERNEL_OPTS="" KERNEL_OPTS=""
if [ "$FIREWALL_WINDOW" != "" ] ; then if [ "$FIREWALL_WINDOW" != "" ] ; then
@ -353,7 +355,7 @@ check_start()
{ {
epmd -names | grep -q $NODE && { epmd -names | grep -q $NODE && {
ps ux | grep -v grep | grep -q $ERLANG_NODE && { ps ux | grep -v grep | grep -q $ERLANG_NODE && {
echo "ejabberd is already running." echo "ejabberd in node $ERLANG_NODE is already running."
exit 4 exit 4
} || { } || {
ps ux | grep beam | grep -v "grep beam" && { ps ux | grep beam | grep -v "grep beam" && {