From 9bb4f124ad01d18811c132e96e0824a986a13ea8 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Mon, 17 Jan 2011 17:28:12 +0100
Subject: [PATCH] Update NODE and HOST with the definitive values from
 ejabberdctl or command line

---
 src/ejabberdctl.template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 931b10236..11dd3037a 100644
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -77,6 +77,8 @@ fi
 
 NAME=-name
 [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && NAME=-sname
+NODE=${ERLANG_NODE%@*}
+HOST=${ERLANG_NODE#*@}
 
 KERNEL_OPTS=""
 if [ "$FIREWALL_WINDOW" != "" ] ; then
@@ -353,7 +355,7 @@ check_start()
 {
     epmd -names | grep -q $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
         } || {
             ps ux | grep beam | grep -v "grep beam" && {