Attachment #71512 for bug #110556

View | Details | Raw Unified | Return to bug 110556
Collapse All | Expand All




	checkconfig || return 1
	ebegin "Stopping apache2"
	${APACHE2} ${APACHE2_OPTS} -k stop

	PID=`cat /var/run/apache2.pid 2>/dev/null`

        # Now we have to wait until squid has _really_ stopped.
        sleep 2
        if test -n "$PID" && kill -0 $PID 2>/dev/null
        then
                einfon "Waiting ."
                cnt=0
                while kill -0 $PID 2>/dev/null
                do
                        cnt=`expr $cnt + 1`
                        if [ $cnt -gt 60 ]
                        then
                                # Waited 120 seconds now. Fail.
                                eend 1 "Failed."
                                break
                        fi
                        sleep 2
                        echo -n "."
                done
                echo -n "done."
                eend 0
        else
                eend 0
        fi

	eend $?
}


Return to bug 110556

Lines 83-88 Link Here

(-)/tmp/apache2 (+27 lines)
83	checkconfig \|\| return 1	83	checkconfig \|\| return 1
84	ebegin "Stopping apache2"	84	ebegin "Stopping apache2"
85	${APACHE2} ${APACHE2_OPTS} -k stop	85	${APACHE2} ${APACHE2_OPTS} -k stop
		86
		87	PID=`cat /var/run/apache2.pid 2>/dev/null`
		88
		89	# Now we have to wait until squid has _really_ stopped.
		90	sleep 2
		91	if test -n "$PID" && kill -0 $PID 2>/dev/null
		92	then
		93	einfon "Waiting ."
		94	cnt=0
		95	while kill -0 $PID 2>/dev/null
		96	do
		97	cnt=`expr $cnt + 1`
		98	if [ $cnt -gt 60 ]
		99	then
		100	# Waited 120 seconds now. Fail.
		101	eend 1 "Failed."
		102	break
		103	fi
		104	sleep 2
		105	echo -n "."
		106	done
		107	echo -n "done."
		108	eend 0
		109	else
		110	eend 0
		111	fi
		112
86	eend $?	113	eend $?
87	}	114	}
88		115