mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-23 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Wait for tor to die in init stop. Let the user know if it doesn't

Browse source 
svn:r1223
This commit is contained in:
Peter Palfrader 2004-03-03 13:23:19 +00:00
parent ee3ed492ee
commit 3e452fed54
2 changed files with 61 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -5,8 +5,9 @@ tor (0.0.1+0.0.2pre24-1) unstable; urgency=low
* Add "# ulimit -c unlimited" to tor.default
* Always enable DataDirectory.
* Actually use dpatch now (to modify upstream torrc.in)
* Wait for tor to die in init stop. Let the user know if it doesn't.
-- Peter Palfrader <weasel@debian.org> Wed, 3 Mar 2004 13:48:09 +0100
-- Peter Palfrader <weasel@debian.org> Wed, 3 Mar 2004 14:10:25 +0100
tor (0.0.1+0.0.2pre23-1) unstable; urgency=low

69
debian/tor.init vendored
View file

@ -1,26 +1,53 @@
#! /bin/sh
set -e
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/tor
NAME=tor
DESC="tor daemon"
TORLOG=/var/log/tor/log
TORPID=/var/run/tor/tor.pid
DEFAULTSFILE=/etc/default/$NAME
WAITFORDAEMON=10
ARGS="--pidfile $TORPID --logfile $TORLOG --runasdaemon 1"
test -x $DAEMON || exit 0
# Include tor defaults if available
if [ -f /etc/default/tor ] ; then
. /etc/default/tor
if [ -f $DEFAULTSFILE ] ; then
. $DEFAULTSFILE
fi
set -e
wait_for_deaddaemon () {
pid=$1
sleep 1
if test -n "$pid"
then
if kill -0 $pid 2>/dev/null
then
echo -n "."
cnt=0
while kill -0 $pid 2>/dev/null
do
cnt=`expr $cnt + 1`
if [ $cnt -gt $WAITFORDAEMON ]
then
echo " FAILED."
return 1
fi
sleep 1
echo -n "."
done
fi
fi
return 0
}
case "$1" in
start)
if [ "$RUN_DAEMON" != "yes" ]; then
echo "Not starting $DESC (Disabled in /etc/default/tor)."
echo "Not starting $DESC (Disabled in $DEFAULTSFILE)."
else
echo -n "Starting $DESC: "
start-stop-daemon --start --quiet --oknodo \
@ -32,14 +59,36 @@ case "$1" in
;;
stop)
echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --oknodo --pidfile $TORPID \
--exec $DAEMON
echo "$NAME."
pid=`cat $TORPID 2>/dev/null` || true
if test ! -f $TORPID -o -z "$pid"
then
echo "not running (there is no $TORPID)."
elif start-stop-daemon --stop --quiet --pidfile $TORPID --exec $DAEMON
then
wait_for_deaddaemon $pid
echo "$NAME."
elif kill -0 $pid 2>/dev/null
then
echo "FAILED (Is $pid not $NAME? Is $DAEMON a different binary now?)."
else
echo "FAILED ($DAEMON died: process $pid not running)."
fi
;;
reload|force-reload)
echo "Reloading $DESC configuration."
start-stop-daemon --stop --signal 1 --oknodo --quiet --pidfile $TORPID \
--exec $DAEMON
echo -n "Reloading $DESC configuration: "
pid=`cat $TORPID 2>/dev/null` || true
if test ! -f $TORPID -o -z "$pid"
then
echo "not running (there is no $TORPID)."
elif start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --exec $DAEMON
then
echo "$NAME."
elif kill -0 $pid 2>/dev/null
then
echo "FAILED (Is $pid not $NAME? Is $DAEMON a different binary now?)."
else
echo "FAILED ($DAEMON died: process $pid not running)."
fi
;;
restart)
$0 stop