Attachment 116463 Details for Bug 158410 – file.diff

[patch] file.diff

file.diff (text/plain), 1.01 KB, created by Phil Phillips on 2011-06-28 21:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Phil Phillips

Created: 2011-06-28 21:30:09 UTC

Size: 1.01 KB

patch

obsolete

>--- tomcat55.sh.in.orig	2011-06-28 13:07:26.000000000 -0700
>+++ tomcat55.sh.in	2011-06-28 13:11:22.000000000 -0700
>@@ -132,31 +132,20 @@
> }
> 
> tomcat%%TOMCAT_VERSION%%_stop() {
>-	rc_pid=$(check_pidfile $pidfile $procname)
>-
>-	if [ -z `cat $pidfile` ]; then
>-		[ -n `cat $pidfile` ] && return 0
>-		if [ -n `cat $pidfile` ]; then
>-			echo "${name} not running? (check $pidfile)."
>-		else
>-			echo "${name} not running?"
>-		fi
>+	if [ ! -e "$pidfile" ]; then
>+		echo "${name} not running? (check $pidfile)."
> 		return 1
> 	fi
> 	
> 	echo "Stopping ${name}."
> 	${java_command} stop
> 	tomcat_wait_max_for_pid ${tomcat%%TOMCAT_VERSION%%_stop_timeout} `cat $pidfile`
>-	kill -KILL ${rc_pid} 2> /dev/null && echo "Killed."
>-	echo -n > ${pidfile}
>+	kill -KILL `cat $pidfile` 2> /dev/null && echo "Killed."
>+	rm -f ${pidfile}
> }
> 
> tomcat%%TOMCAT_VERSION%%_status() {
>-	if [ ! -f $pidfile ]; then
>-          pid_touch
>-        fi
>-
>-	if [ -z `cat $pidfile` ]; then
>+	if [ ! -e "$pidfile" ]; then
> 	  echo "${name} is not running."
> 	  return 1
> 	else

Actions: View | Diff

Attachments on bug 158410: 116463