* [gentoo-commits] gentoo-x86 commit in net-im/ejabberd/files: ejabberd-3.initd
@ 2010-05-28 10:52 Peter Volkov (pva)
0 siblings, 0 replies; 3+ messages in thread
From: Peter Volkov (pva) @ 2010-05-28 10:52 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-im/ejabberd/files: ejabberd-3.initd
@ 2010-06-02 7:12 Peter Volkov (pva)
0 siblings, 0 replies; 3+ messages in thread
From: Peter Volkov (pva) @ 2010-06-02 7:12 UTC (permalink / raw
To: gentoo-commits
pva 10/06/02 07:12:27
Modified: ejabberd-3.initd
Log:
Make stop at init script working again, thank krigstask for report.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.3 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.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?r1=1.2&r2=1.3
Index: ejabberd-3.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ejabberd-3.initd 28 May 2010 10:52:20 -0000 1.2
+++ ejabberd-3.initd 2 Jun 2010 07:12:27 -0000 1.3
@@ -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.2 2010/05/28 10:52:20 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.3 2010/06/02 07:12:27 pva Exp $
depend() {
use dns
@@ -20,7 +20,8 @@
}
stop() {
- if ejabberdctl status >/dev/null 2>&1 || test $? = 3; then
+ ejabberdctl status >/dev/null 2>&1
+ if test $? = 3; then
ewarn "ejabberd is already stopped (manually?)."
return 0
fi
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-im/ejabberd/files: ejabberd-3.initd
@ 2013-04-05 9:03 Tim Harder (radhermit)
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder (radhermit) @ 2013-04-05 9:03 UTC (permalink / raw
To: gentoo-commits
radhermit 13/04/05 09:03:34
Modified: ejabberd-3.initd
Log:
Version bump. Fix variable name in init script (bug #443890) and add myself as a maintainer.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Revision Changes Path
1.4 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.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?r1=1.3&r2=1.4
Index: ejabberd-3.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejabberd-3.initd 2 Jun 2010 07:12:27 -0000 1.3
+++ ejabberd-3.initd 5 Apr 2013 09:03:34 -0000 1.4
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 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.3 2010/06/02 07:12:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.4 2013/04/05 09:03:34 radhermit Exp $
depend() {
use dns
@@ -15,7 +15,7 @@
return 0
fi
ebegin "Starting ejabberd"
- /usr/sbin/ejabberdctl ${EJABBERDCTL_OPT} start
+ /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
eend $?
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-04-05 9:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-05 9:03 [gentoo-commits] gentoo-x86 commit in net-im/ejabberd/files: ejabberd-3.initd Tim Harder (radhermit)
-- strict thread matches above, loose matches on Subject: below --
2010-06-02 7:12 Peter Volkov (pva)
2010-05-28 10:52 Peter Volkov (pva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox