rpms/ejabberd/F-12 ejabberd.init, 1.10, 1.11 ejabberd.spec, 1.52, 1.53 import.log, 1.20, 1.21

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5351/F-12

Modified Files:
	ejabberd.init ejabberd.spec import.log 
Log Message:
Init-script enhancements


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd.init,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ejabberd.init	21 Nov 2009 08:02:52 -0000	1.10
+++ ejabberd.init	18 Mar 2010 10:31:17 -0000	1.11
@@ -32,6 +32,13 @@ start() {
 	if [ "$ULIMIT_MAX_FILES" ]; then
 		ulimit -n $ULIMIT_MAX_FILES
 	fi
+
+	# check whether ejabberd was already started
+	if /usr/sbin/ejabberdctl status > /dev/null 2>&1 ; then
+		echo -n "already running" && warning && echo
+		return 0
+	fi
+
 	daemon /usr/sbin/ejabberdctl start
 				--config $CONFIG_FILE \
 				--ctl-config /etc/ejabberd/ejabberdctl.cfg \
@@ -41,16 +48,31 @@ start() {
         RETVAL=$?
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/ejabberd
         echo
+
+	# it takes some time to actually start necessary nodes
+	sleep 5
+
         return $RETVAL
 }
 
 stop() {
         # Stop daemons.
         echo -n "Shutting down ejabberd: "
+
+	# check whether ejabberd was already stopped
+	if ! /usr/sbin/ejabberdctl status > /dev/null 2>&1 ; then
+		echo -n "already stopped" && warning && echo
+		return 0
+	fi
+
 	daemon /usr/sbin/ejabberdctl stop 2>/dev/null
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd
         echo
+
+	# it takes some time to actually stop necessary nodes
+	sleep 5
+
         return $RETVAL
 }
 


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ejabberd.spec	12 Mar 2010 16:01:40 -0000	1.52
+++ ejabberd.spec	18 Mar 2010 10:31:17 -0000	1.53
@@ -12,7 +12,7 @@
 
 Name:           ejabberd
 Version:        2.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -369,6 +369,9 @@ rm -rf %{buildroot}
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Mar 18 2010 Peter Lemenkov <lemenkov at gmail.com> 2.1.3-2
+- Init-script enhancements
+
 * Fri Mar 12 2010 Peter Lemenkov <lemenkov at gmail.com> 2.1.3-1
 - Ver. 2.1.3
 - Patches rebased


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/import.log,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- import.log	12 Mar 2010 16:01:41 -0000	1.20
+++ import.log	18 Mar 2010 10:31:17 -0000	1.21
@@ -18,3 +18,4 @@ ejabberd-2_1_1-1_fc12:F-12:ejabberd-2.1.
 ejabberd-2_1_2-1_fc12:F-12:ejabberd-2.1.2-1.fc12.src.rpm:1264423541
 ejabberd-2_1_2-2_fc12:F-12:ejabberd-2.1.2-2.fc12.src.rpm:1264770848
 ejabberd-2_1_3-1_fc12:F-12:ejabberd-2.1.3-1.fc12.src.rpm:1268409662
+ejabberd-2_1_3-2_fc12:F-12:ejabberd-2.1.3-2.fc12.src.rpm:1268908251