Attachment 702486 Details for Bug 915450 – Patch

[patch] Patch

915450.patch (text/plain), 2.43 KB, created by Etienne Carrière on 2013-02-25 19:12:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Etienne Carrière

Created: 2013-02-25 19:12:23 UTC

Size: 2.43 KB

patch

obsolete

>--- tomcat6.rhel6	2013-02-25 19:45:19.738504418 +0100
>+++ tomcat6.915450	2013-02-25 20:10:20.778588985 +0100
>@@ -69,6 +69,8 @@
> # Define the tomcat log file
> TOMCAT_LOG="${TOMCAT_LOG:-/var/log/${NAME}/catalina.out}"
> 
>+CATALINA_PID="${CATALINA_PID:-/var/run/${NAME}.pid}"
>+
> RETVAL="0"
> 
> # Look for open ports, as the function name might imply
>@@ -149,8 +151,8 @@
>      return
>    fi
>    if [ -f "/var/lock/subsys/${NAME}" ]; then
>-        if [ -f "/var/run/${NAME}.pid" ]; then
>-            read kpid < /var/run/${NAME}.pid
>+        if [ -f "$CATALINA_PID" ]; then
>+            read kpid < $CATALINA_PID
> #           if checkpid $kpid 2>&1; then
>             if [ -d "/proc/${kpid}" ]; then
>                 log_success_msg
>@@ -163,7 +165,6 @@
>         fi
>     fi
>     # fix permissions on the log and pid files
>-    export CATALINA_PID="/var/run/${NAME}.pid"
>     touch $CATALINA_PID 2>&1 || RETVAL="4"
>     if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then 
>       chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
>@@ -211,8 +212,8 @@
>       fi
>       if [ "$RETVAL" -eq "0" ]; then
>          count="0"
>-         if [ -f "/var/run/${NAME}.pid" ]; then
>-            read kpid < /var/run/${NAME}.pid
>+         if [ -f "$CATALINA_PID" ]; then
>+            read kpid < $CATALINA_PID
>             until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \
>                       [ "$count" -gt "$SHUTDOWN_WAIT" ]; do
>                     if [ "$SHUTDOWN_VERBOSE" = "true" ]; then
>@@ -229,7 +230,7 @@
>                 fi
>                 log_success_msg
>             fi
>-            rm -f /var/lock/subsys/${NAME} /var/run/${NAME}.pid
>+            rm -f /var/lock/subsys/${NAME} $CATALINA_PID
>         else
>             log_failure_msg
>             RETVAL="4"
>@@ -280,8 +281,8 @@
> 
> function checkpidfile()
> {
>-   if [ -f "/var/run/${NAME}.pid" ]; then
>-      read kpid < /var/run/${NAME}.pid
>+   if [ -f "$CATALINA_PID" ]; then
>+      read kpid < $CATALINA_PID
>       if [ -d "/proc/${kpid}" ]; then
> # The pid file exists and the process is running
>           RETVAL="0"
>@@ -315,7 +316,7 @@
>         start
>         ;;
>     condrestart|try-restart)
>-        if [ -f "/var/run/${NAME}.pid" ]; then
>+        if [ -f "$CATALINA_PID" ]; then
>             stop
>             start
>         fi
>@@ -324,7 +325,7 @@
>         RETVAL="3"
>         ;;
>     force-reload)
>-        if [ -f "/var/run/${NAME}.pid" ]; then
>+        if [ -f "$CATALINA_PID" ]; then
>             stop
>             start
>         fi

Actions: View | Diff

Attachments on bug 915450: 702486 | 702494