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

(-)file_not_specified_in_diff (-9 / +5 lines)
Line  Link Here
0
-- ../init.d.orig/tomcat55     2008-08-22 11:54:52.000000000 +0200
0
++ tomcat55    2009-04-16 09:23:21.000000000 +0200
Lines 26-39 Link Here
26
26
27
tomcatIsRunning()
27
tomcatIsRunning()
28
{
28
{
29
  tomcat_ps_log=`mktemp /var/tmp/tomcat-ps.log.XXXXXX`
29
  # -u : user; -U effective user; -o format (%a=arguments); -w -w: unlimited width
30
  ps aux --cols 1024 >"$tomcat_ps_log"
30
  ps -u "$TOMCAT_BASE_USER" -U "$TOMCAT_BASE_USER" -o '%a' -w -w | \
31
  tomcat_is_running="false"
31
    grep -v '^grep ' | \
32
  if grep " -Dcatalina.base=$CATALINA_BASE.*-Dcatalina.home=$CATALINA_HOME.*org.apache.catalina.startup.Bootstrap" "$tomcat_ps_log" >/dev/null 2>/dev/null ; then
32
    grep -q " -Dcatalina.base=$CATALINA_BASE.*-Dcatalina.home=$CATALINA_HOME.*org.apache.catalina.startup.Bootstrap"
33
    tomcat_is_running="true"
34
  fi
35
  rm -f "$tomcat_ps_log"
36
  test "$tomcat_is_running" = "true"
37
}
33
}

Return to bug 496371