[25516] in Source-Commits
/svn/athena r25046 - trunk/third/moira/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Mar 15 23:00:09 2011
Date: Tue, 15 Mar 2011 23:00:03 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201103160300.p2G303pw020403@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-03-15 23:00:03 -0400 (Tue, 15 Mar 2011)
New Revision: 25046
Modified:
trunk/third/moira/debian/changelog
trunk/third/moira/debian/debathena-moira-update-server.init
Log:
In moira:
* Use a .pid file in the initscript
Modified: trunk/third/moira/debian/changelog
===================================================================
--- trunk/third/moira/debian/changelog 2011-03-16 02:18:31 UTC (rev 25045)
+++ trunk/third/moira/debian/changelog 2011-03-16 03:00:03 UTC (rev 25046)
@@ -1,8 +1,9 @@
debathena-moira (4.0.0+svn20100405-0debathena3) unstable; urgency=low
* Add manpages for addusr and namespace (Trac: 268)
+ * Use a .pid file in the initscript
- -- Jonathan Reed <jdreed@mit.edu> Thu, 10 Mar 2011 14:23:20 -0500
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 15 Mar 2011 22:59:55 -0400
debathena-moira (4.0.0+svn20100405-0debathena2) unstable; urgency=low
Modified: trunk/third/moira/debian/debathena-moira-update-server.init
===================================================================
--- trunk/third/moira/debian/debathena-moira-update-server.init 2011-03-16 02:18:31 UTC (rev 25045)
+++ trunk/third/moira/debian/debathena-moira-update-server.init 2011-03-16 03:00:03 UTC (rev 25046)
@@ -22,6 +22,7 @@
DAEMON_ARGS=""
SCRIPTNAME=/etc/init.d/$NAME
ENABLED=false
+PIDFILE=/var/run/update_server.pid
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
@@ -50,7 +51,8 @@
# 2 if daemon could not be started
start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
|| return 1
- start-stop-daemon --start --quiet --exec $DAEMON -- \
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --exec $DAEMON -- \
$DAEMON_ARGS \
|| return 2
# Add code here, if necessary, that waits for the process to be ready
@@ -68,7 +70,7 @@
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
# Wait for children to finish too if this is a daemon that forks
