[gentoo-commits] gentoo-x86 commit in net-im/ejabberd/files: ejabberd-3.initd

["Peter Volkov (pva)" <pva@gentoo.org>]

pva         10/05/28 10:52:20

  Modified:             ejabberd-3.initd
  Log:
  Make init script a bit more resistant, e.g. restart should now work, thank Rion for report.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-im/ejabberd/files/ejabberd-3.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?r1=1.1&r2=1.2

Index: ejabberd-3.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd-3.initd	26 May 2010 20:25:25 -0000	1.1
+++ ejabberd-3.initd	28 May 2010 10:52:20 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.1 2010/05/26 20:25:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.2 2010/05/28 10:52:20 pva Exp $
 
 depend() {
 	use dns
@@ -10,13 +10,37 @@
 }
 
 start() {
+	if ejabberdctl status >/dev/null 2>&1; then
+		ewarn "ejabberd is already started (manually?)."
+		return 0
+	fi
 	ebegin "Starting ejabberd"
 	/usr/sbin/ejabberdctl ${EJABBERDCTL_OPT} start
 	eend $?
 }
 
 stop() {
+	if ejabberdctl status >/dev/null 2>&1 || test $? = 3; then
+		ewarn "ejabberd is already stopped (manually?)."
+		return 0
+	fi
 	ebegin "Stopping ejabberd"
-	/usr/sbin/ejabberdctl stop
-	eend $?
+	if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
+		cnt=0
+		sleep 1
+		while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
+			echo -n .
+			cnt=`expr $cnt + 1`
+			if [ $cnt -ge 60 ] ; then
+				eend 1
+				break
+			fi
+			sleep 1
+		done
+		eend 0
+	else
+		eend 1
+		einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's going on."
+	fi
+	eend 0
 }